X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Ffiles%2Fsafedel.pl;h=30503fa50c4b0f87abbcd5e3b7f8d011e0e85040;hb=e471e89ab16d0224ad0abf3f1c1bef39481aa254;hp=44288b414e9d1cd6dadffcf68e57b1083a25919f;hpb=7292b72668557e9dfcff71eea9729cbd8b523c94;p=feisty_meow.git

diff --git a/scripts/files/safedel.pl b/scripts/files/safedel.pl
index 44288b41..30503fa5 100644
--- a/scripts/files/safedel.pl
+++ b/scripts/files/safedel.pl
@@ -20,19 +20,19 @@
 ###############################################################################
 
 require Cwd;
-require "ctime.pl";
 require "filename_helper.pl";
 require "inc_num.pl";
-require "importenv.pl";
 require "zap_the_dir.pl";
 
+use Env qw(TMP OS);
+
 #hmmm: need a usage statement.
 
 if ($#ARGV < 0) {
   die "Too few arguments to command.";
 }
 
-$DEV_NULL = "&> /dev/null";
+$DEV_NULL = "> /dev/null 2> /dev/null";
 if ($OS eq "UNIX") {
   $FIND_ENDING = "';'";
   $zip = "zip -y ";
@@ -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 {
@@ -123,7 +125,8 @@ sub safedel {
     print "Trashed [@deleted].\n";
     open(REPORT, ">>$TMP/zz_safedel.rpt");
 
-    local($printable_date) = &ctime(time);
+    local($printable_date) = scalar(localtime());
+#&ctime(time);
     $printable_date =~ s/\n//g;
     print REPORT $printable_date . " -- safedel: \"temp" . $number . ".zip\" <= [@deleted]\n";
     close(REPORT);