X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Ffiles%2Fsafedel.pl;h=c009cc2a4d6f15930a7fb1d88a2dfc4da727ac52;hb=b05e6b5ce5f7b901d70b019841dbbeac93c93923;hp=7cf9647ade5e9d55f562b33b8ef40693ac1fe502;hpb=2952ccf47b80174880141a7ecfa122089f349b8d;p=feisty_meow.git

diff --git a/scripts/files/safedel.pl b/scripts/files/safedel.pl
index 7cf9647a..c009cc2a 100644
--- a/scripts/files/safedel.pl
+++ b/scripts/files/safedel.pl
@@ -20,26 +20,25 @@
 ###############################################################################
 
 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 2> /dev/null";
 if ($OS eq "UNIX") {
   $FIND_ENDING = "';'";
-  $DEV_NULL = "> /dev/null";
   $zip = "zip -y ";
 } elsif ( ($OS eq "DOS") || ($OS eq "Windows_95")
     || ($OS eq "Windows_98") || ($OS eq "Windows_NT") ) {
   $FIND_ENDING = "';'";
-  $DEV_NULL = "> nul";
   $zip = "zip ";
 } else {
   die "The Operating System variable (OS) is not set.\n";
@@ -73,9 +72,15 @@ sub safedel {
 #  print "final list of whackees: @to_delete\n";
 
   # we store the deleted files in a directory under the temporary directory.
+  if (! -d $TMP) { 
+    mkdir "$TMP", 0700;
+    if (! -d $TMP) {
+      die "the TMP directory $TMP could not be created!\n";
+    }
+  }
   $temp_subdir = $TMP . "/zz_del_keep";
   if (! -d $temp_subdir) {
-    mkdir "$temp_subdir", 0777;
+    mkdir "$temp_subdir", 0700;
       # create the subdirectory under temp if missing.
     if (! -d $temp_subdir) {
       die "the directory $temp_subdir could not be created!\n";
@@ -98,12 +103,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) {
@@ -114,6 +119,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 {
@@ -124,7 +131,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);