Merge branch 'dev' of feistymeow.org:feisty_meow into dev

[feisty_meow.git] / scripts / archival / shared_snarfer.pl

diff --git a/scripts/archival/shared_snarfer.pl b/scripts/archival/shared_snarfer.pl
index 6d157163f097f615784d0b0f4019181151c56460..5d1ac7377b1090978732d32bb2ffb31627f07b1b 100644 (file)
--- a/scripts/archival/shared_snarfer.pl
+++ b/scripts/archival/shared_snarfer.pl
@@ -44,9 +44,10 @@ $TMP =~ s/\\/\//g;  # fix the temp variable for ms-winders.
     "octalforty.Wizardby", "*.obr", "*.opt", "packages", 
     "*.pch", "*.pdb", "*.plg", "*.r$p", "*.rcs", "Release",
     "*.res", "*.RES", "*.rws", "*.sbr", "*.scc", "*.spx", "*.stackdump",
+    "Steam",
     "*.sdf", "*.suo", ".svn", "*.sym", "*.td", "*.tds", "*.tdw", "*.tlb",
     "*.trw", "*.tmp", "*.tr", "*.user", "*_version.h", "*_version.rc",
-    "*.vspscc", "waste");
+    "*.vspscc", "waste", "zeitgeist");
 #print "junk list=@junk_file_list\n";
 @excludes = ();
 for (local($i) = 0; $i < scalar(@junk_file_list); $i++) {
@@ -84,9 +85,12 @@ sub short_hostname {
 # a timestamp and hostname.
 sub snarf_prefix {
   local($base) = @_;
+
+#hmmm: extract this shared code to new function (also in safedel)
   $date_tool = "date";
   local($date_part) = `$date_tool +%Y-%m-%d-%H%M`;
   while ($date_part =~ /[\r\n]$/) { chop $date_part; }
+
   local($host) = &short_hostname();
   while ($host =~ /[\r\n]$/) { chop $host; }
   $base = $base . "_" . $host . "_" . $date_part;
@@ -204,6 +208,7 @@ sub snarf_file_list {
   local($target_file) = &snarf_name($prefix, $number);
 
   local($currdir) = cwd();
+#print "got root as: '$root'\n";
   chdir("$root");
 
   local(@files) = &glob_list($file_pattern);
@@ -451,7 +456,7 @@ sub restore_archive {
   if ($outcome) { die("failure to undo archive"); }
 
   local($outcome) =
-      0xff & system "bash", "$FEISTY_MEOW_SCRIPTS/files/normal_perm.sh", ".";
+      0xff & system "bash", "$FEISTY_MEOW_SCRIPTS/security/normal_perm.sh", ".";
   if ($outcome) { die("failure to normalize permissions"); }
 
   # remove any links that might have crept in; these can cause mischief.