X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Farchival%2Fshared_snarfer.pl;h=5d1ac7377b1090978732d32bb2ffb31627f07b1b;hb=884837a0e586db1068cafef194f94392ad049e45;hp=4747d07e70b9dd2b5de402d70274a2fb2b44777a;hpb=8f895d043c02ca40792352023916baa977f827ff;p=feisty_meow.git diff --git a/scripts/archival/shared_snarfer.pl b/scripts/archival/shared_snarfer.pl index 4747d07e..5d1ac737 100644 --- a/scripts/archival/shared_snarfer.pl +++ b/scripts/archival/shared_snarfer.pl @@ -85,9 +85,12 @@ sub short_hostname { # a timestamp and hostname. sub snarf_prefix { local($base) = @_; + +#hmmm: extract this shared code to new function (also in safedel) $date_tool = "date"; local($date_part) = `$date_tool +%Y-%m-%d-%H%M`; while ($date_part =~ /[\r\n]$/) { chop $date_part; } + local($host) = &short_hostname(); while ($host =~ /[\r\n]$/) { chop $host; } $base = $base . "_" . $host . "_" . $date_part; @@ -453,7 +456,7 @@ sub restore_archive { if ($outcome) { die("failure to undo archive"); } local($outcome) = - 0xff & system "bash", "$FEISTY_MEOW_SCRIPTS/files/normal_perm.sh", "."; + 0xff & system "bash", "$FEISTY_MEOW_SCRIPTS/security/normal_perm.sh", "."; if ($outcome) { die("failure to normalize permissions"); } # remove any links that might have crept in; these can cause mischief.