projects
/
grml.org.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use directory below tempdir
[grml.org.git]
/
gen_website
diff --git
a/gen_website
b/gen_website
index
0a92b8a
..
7069102
100755
(executable)
--- a/
gen_website
+++ b/
gen_website
@@
-29,6
+29,8
@@
my @files = File::Find::Rule->or( $git, $file_rule )
#create a tempdir
my $tempdir = tempdir( CLEANUP => 1 );
#create a tempdir
my $tempdir = tempdir( CLEANUP => 1 );
+make_path("$tempdir/out") or die "Could not create $tempdir/out: $!";
+
#initialize template toolkit
#initialize template toolkit
@@
-43,13
+45,13
@@
foreach my $file (@files) {
|| die "Could not process file \"$file\": $!";
my ($name,$path,$suffix) = fileparse($file,qw (.tt2));
|| die "Could not process file \"$file\": $!";
my ($name,$path,$suffix) = fileparse($file,qw (.tt2));
-
make_path("$tempdir/$path") unless -d "$tempdir
/$path";
- open (my $fh, '>', "$tempdir/$path/$name")
+
make_path("$tempdir/out/$path") unless -d "$tempdir/out
/$path";
+ open (my $fh, '>', "$tempdir/
out/
$path/$name")
or die "Could not write to $file: $!";
print $fh $output;
close($fh);
} else {
or die "Could not write to $file: $!";
print $fh $output;
close($fh);
} else {
- fcopy ($file, "$tempdir/
$file") or die "Could not copy $file to $tempdir
/$file: $!";
+ fcopy ($file, "$tempdir/
out/$file") or die "Could not copy $file to $tempdir/out
/$file: $!";
}
}
}
}
@@
-58,8
+60,8
@@
if (-d $out_dir) {
dirmove ($out_dir, $out_dir . ".bak")
or die "Could not move $out_dir to $out_dir.bak: $!";
}
dirmove ($out_dir, $out_dir . ".bak")
or die "Could not move $out_dir to $out_dir.bak: $!";
}
-if (! dirmove (
$tempdir
, "$out_dir")) {
- warn "Could not move $tempdir to $out_dir: $!";
+if (! dirmove (
"$tempdir/out"
, "$out_dir")) {
+ warn "Could not move $tempdir
/out
to $out_dir: $!";
warn "Rollback";
remove_tree($out_dir);
dirmove ($out_dir . ".bak", $out_dir);
warn "Rollback";
remove_tree($out_dir);
dirmove ($out_dir . ".bak", $out_dir);