From: Chris Koeritz <fred@gruntose.com>
Date: Fri, 2 Mar 2012 20:28:39 +0000 (-0500)
Subject: fixing for windows perhaps; maybe the lack of space after zip -rm
X-Git-Tag: 2.140.90~1539
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=96aa64844fffd86ff5c2283d1068e1240fc8b941;p=feisty_meow.git

fixing for windows perhaps; maybe the lack of space after zip -rm
was suddenly a problem on cygwin?
---

diff --git a/scripts/files/safedel.pl b/scripts/files/safedel.pl
old mode 100644
new mode 100755
index 97fa01d9..ab64a278
--- a/scripts/files/safedel.pl
+++ b/scripts/files/safedel.pl
@@ -97,12 +97,12 @@ sub safedel {
       next;
     }
     $tempfile = $temp_subdir . "/temp" . "$number";
-#   print "tempfile is $tempfile; file is $file.\n";
+#print "tempfile is $tempfile; file is $file.\n";
     if (-d $file) {
       # ensure there aren't any read only files.
       system("chmod -R u+rw \"$file\"");
       # store the directory in the trash storage.
-      system("$zip -rm$use_path $tempfile \"$file$wildcard\" $DEV_NULL");
+      system("$zip -rm $use_path $tempfile \"$file$wildcard\" $DEV_NULL");
         # zip up the files into the safekeeper directory.
       # recursively unlink in case zip doesn't remove the empty dir.
       if (-d $file) {
@@ -113,6 +113,8 @@ sub safedel {
     } elsif (-f $file) {
       # store the file in the trash storage.
       system("chmod u+rw \"$file\"");
+
+#print "about to run: system [$zip -m$use_path $tempfile '$file' $DEV_NULL]";
       system("$zip -m$use_path $tempfile \"$file\" $DEV_NULL");
       push(@deleted, "$file");
     } else {