X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Ffiles%2Fsafedel.pl;h=3892cb64e302cfcd01051a9697db7284351a19d1;hb=3a3dfeffb6b31a73b64d181964fcc85748259929;hp=ab64a2780816b773369223d4af1f538552066eca;hpb=96aa64844fffd86ff5c2283d1068e1240fc8b941;p=feisty_meow.git

diff --git a/scripts/files/safedel.pl b/scripts/files/safedel.pl
old mode 100755
new mode 100644
index ab64a278..3892cb64
--- a/scripts/files/safedel.pl
+++ b/scripts/files/safedel.pl
@@ -20,12 +20,12 @@
 ###############################################################################
 
 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) {
@@ -72,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.
-  $temp_subdir = $TMP . "/zz_del_keep";
+  if (! -d $TMP) { 
+    mkdir "$TMP", 0700;
+    if (! -d $TMP) {
+      die "the TMP directory $TMP could not be created!\n";
+    }
+  }
+  $temp_subdir = $TMP . "/zz_safedel_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";
@@ -109,23 +115,24 @@ sub safedel {
         # remove the directory itself if possible, since zip did not.
         &recursively_zap_dirs($file);
       }
-      push(@deleted, "$file");
+      push(@deleted, "\"$file\"");
     } 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");
+      push(@deleted, "\"$file\"");
     } else {
       print "$0 cannot find \"$file\" to delete it.\n";
     }
   }
   if (@deleted) {
     print "Trashed [@deleted].\n";
-    open(REPORT, ">>$TMP/zz_safedel.rpt");
+    open(REPORT, ">>$TMP/zz_safedel_report.txt");
 
-    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);