much cleanly, temporarily hiding the ability to whack junk

dirs, but the bug that made that go hidden is fixed.

diff --git a/scripts/files/filename_helper.pl b/scripts/files/filename_helper.pl
index 9b8668c2f31070f8d1dbdf63ffc5a8ed63944572..318e5829dbf6ec629416b3b9737abf4018c07e04 100644 (file)
--- a/scripts/files/filename_helper.pl
+++ b/scripts/files/filename_helper.pl
@@ -333,7 +333,7 @@ sub important_filename {
       "\\.sbr", ".*scc", "^Setup\\.dbg", "^Setup\\.inx",
       "^Setup\\.map", "^Setup\\.obs", "^Selenium_.*Login.html",
       "\\.stackdump", "^string1033\\.txt", "\\.suo", "\\.swp",
-      "^thumbs.db", "\\.tmp", "^trans\\.tbl", "\\.user", "_version\\.h",
+      "^thumbs.db", "[a-zA-Z0-9]\\.tmp", "^trans\\.tbl", "\\.user", "_version\\.h",
       "_version\\.rc", "^waste", "\\.ws4", "\\.wsm");
 
   foreach $temp (@junk_files) {
@@ -394,9 +394,16 @@ sub upper {
 # recursively deletes a directory that is passed as the single parameter.
 # from http://developer.novell.com/wiki/index.php/Recursive_Directory_Remove
 sub recursive_delete {
+
+#hmmm: this should iterate across all params.
   my $dir = shift;
-  local *DIR;
 
+  if ( -f "$dir" ) {
+print "this is not a dir: $dir\nshould whack it here?\n";
+return;
+  }
+
+  local *DIR;
   opendir DIR, $dir or die "opendir $dir: $!";
   my $found = 0;
   while ($_ = readdir DIR) {

diff --git a/scripts/files/zap_the_dir.pl b/scripts/files/zap_the_dir.pl
index 6d0b6212144237fd519559499836a82984aae3a3..049838509250fbbe4dd1bc94cf53162a5220209b 100644 (file)
--- a/scripts/files/zap_the_dir.pl
+++ b/scripts/files/zap_the_dir.pl
@@ -42,9 +42,11 @@ sub remove_whackables {
       $fname = $from_dir . '/' . $fname;
 #print "whacking: $fname.\n";
       unlink $fname;
-      if (-d "$fname") {
-        print "recursively deleting directory: $fname\n";
+      if (-f "$fname") {
+        print "cleaning file: $fname\n";
         &recursive_delete($fname);
+      } else {
+        print "not touching unimportant dir right now: $fname\n";
       }
     }
   }

diff --git a/scripts/files/zapdirs.pl b/scripts/files/zapdirs.pl
index d69da8a0ee87718236c4eb889125eb3cdda2c500..16a5e0ab730576c6abaf3adcab1b18a6af78e3ca 100644 (file)
--- a/scripts/files/zapdirs.pl
+++ b/scripts/files/zapdirs.pl
@@ -47,7 +47,7 @@ if ($#ARGV < 0) {
   }
 }
 
-#print "zap list is:\n@to_zap\n";
+print "zap list is:\n@to_zap\n";
 
 &recursively_zap_dirs(@to_zap);