projects
/
feisty_meow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
new fortune
[feisty_meow.git]
/
scripts
/
archival
/
shared_snarfer.pl
diff --git
a/scripts/archival/shared_snarfer.pl
b/scripts/archival/shared_snarfer.pl
index 4747d07e70b9dd2b5de402d70274a2fb2b44777a..5d1ac7377b1090978732d32bb2ffb31627f07b1b 100644
(file)
--- 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) = @_;
# 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; }
$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;
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) =
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.
if ($outcome) { die("failure to normalize permissions"); }
# remove any links that might have crept in; these can cause mischief.