renamed a variable to be more meaningful.

[feisty_meow.git] / scripts / files / safedel.pl

diff --git a/scripts/files/safedel.pl b/scripts/files/safedel.pl
index 3892cb64e302cfcd01051a9697db7284351a19d1..e9de40461035bbfad2eb6c6e6dd2f48a81a14cfc 100644 (file)
--- a/scripts/files/safedel.pl
+++ b/scripts/files/safedel.pl
@@ -102,13 +102,19 @@ sub safedel {
       print "ignoring attempt to remove current or parent directory.\n";
       next;
     }
-    $tempfile = $temp_subdir . "/temp" . "$number";
-#print "tempfile is $tempfile; file is $file.\n";
+
+#hmmm: extract this shared bit of code as new method (also in shared snarfer)
+    $date_tool = "date";
+    local($datestamp) = `$date_tool +%Y-%m-%d-%H%M`;
+    while ($datestamp =~ /[\r\n]$/) { chop $datestamp; }
+    $archive_file = $temp_subdir . "/deleted-#$number-" . $datestamp;
+#print "archive_file is $archive_file; 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 $archive_file \"$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) {
@@ -120,8 +126,8 @@ sub safedel {
       # 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");
+#print "about to run: system [$zip -m$use_path $archive_file '$file' $DEV_NULL]";
+      system("$zip -m$use_path $archive_file \"$file\" $DEV_NULL");
       push(@deleted, "\"$file\"");
     } else {
       print "$0 cannot find \"$file\" to delete it.\n";
@@ -134,7 +140,11 @@ sub safedel {
     local($printable_date) = scalar(localtime());
 #&ctime(time);
     $printable_date =~ s/\n//g;
-    print REPORT $printable_date . " -- safedel: \"temp" . $number . ".zip\" <= [@deleted]\n";
+    local($just_archived_filename) = `basename "$archive_file"`;
+    while ($just_archived_filename =~ /[\r\n]$/) { chop $just_archived_filename; }
+    print REPORT "\n";
+    print REPORT $printable_date . " -- created \"" . $just_archived_filename . ".zip\"\n";
+    print REPORT $printable_date . " -- from [@deleted]\n";
     close(REPORT);
   } else {
     print "No files were deleted.\n";