From: Chris Koeritz <fred@gruntose.com>
Date: Sat, 11 Apr 2015 01:07:43 +0000 (-0400)
Subject: totally tasty also; just fixed safedel's issue with bizarre file names.  turns out... 
X-Git-Tag: 2.140.90~664
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=c29eee258afdbf817f829c5765275a1758d9752f;p=feisty_meow.git

totally tasty also; just fixed safedel's issue with bizarre file names.  turns out i was letting the shell interpret the bad special character because i was using double quotes instead of single quotes.  now works on crazy filenames like spacem does.
---

diff --git a/scripts/files/safedel.pl b/scripts/files/safedel.pl
index 60408046..c0d71082 100644
--- a/scripts/files/safedel.pl
+++ b/scripts/files/safedel.pl
@@ -44,12 +44,6 @@ if ($OS eq "UNIX") {
   die "The Operating System variable (OS) is not set.\n";
 }
 
-# The zip program has slightly different parameters depending on the
-# version that will be run.  The DOS version needs to see a -P to remember
-# the directory names.
-$use_path = '';
-$wildcard = "";  # used for reasonable zips, like os/2 or unix.
-
 # set the filename used for numbering.
 local($NUMBER_FILE) = "$TMP/aa_safedel.num";
 
@@ -111,9 +105,9 @@ sub safedel {
 
     if (-d $file) {
       # ensure there aren't any read only files.
-      system("chmod -R u+rw \"$file\"");
+      system("chmod -R u+rw '$file'");
       # store the directory in the trash storage.
-      system("$zip -rm $use_path $archive_file \"$file$wildcard\" $DEV_NULL");
+      system("$zip -rm $archive_file '$file' $DEV_NULL");
         # zip up the files into the safekeeper directory.
       # recursively unlink in case zip doesn't remove the empty dir.
       if (-d $file) {
@@ -122,11 +116,13 @@ sub safedel {
       }
       push(@deleted, "\"$file\"");
     } elsif (-f $file) {
+print "about to chmod file\n";
+      # make the file writable by our user if possible (which resets any
+      # prior permissions as long as we're the owner).
+      system("chmod u+rw '$file'");
       # store the file in the trash storage.
-      system("chmod u+rw \"$file\"");
-
-#print "about to run: system [$zip -m$use_path $archive_file '$file' $DEV_NULL]";
-      system("$zip -m$use_path $archive_file \"$file\" $DEV_NULL");
+#print "about to run: system [$zip -m $archive_file '$file' $DEV_NULL]";
+      system("$zip -m $archive_file '$file' $DEV_NULL");
       push(@deleted, "\"$file\"");
     } else {
       print "$0 cannot find \"$file\" to delete it.\n";