Merge branch 'master' into nonophp

[grml.org.git] / gen_website

diff --git a/gen_website b/gen_website
index e095187..7069102 100755 (executable)
--- a/gen_website
+++ b/gen_website
@@ -5,12 +5,12 @@ use warnings;
 
 use Template;
 use File::Find::Rule;
-use File::Path qw(make_path);
-use File::Basename qw (fileparse);
-use File::Copy::Recursive qw(fcopy);
+use File::Path qw(make_path remove_tree);
+use File::Basename qw (fileparse dirname);
+use File::Copy::Recursive qw(fcopy dirmove);
 use File::Temp qw (tempdir);
 
-my $out_dir = "out/";
+my $out_dir = shift || "out/";
 
 #find all files
 
@@ -27,14 +27,15 @@ my $file_rule = File::Find::Rule->file();
 my @files = File::Find::Rule->or( $git, $file_rule )
                             ->in('.');
 
+#create a tempdir
+my $tempdir = tempdir( CLEANUP => 1 );
+make_path("$tempdir/out") or die "Could not create $tempdir/out: $!";
+
+
 #initialize template toolkit
 
 my $template = Template->new;
 
-if (! -d $out_dir) {
-       make_path($out_dir) or die "Could not create outdir $out_dir: $!";
-}
-
 foreach my $file (@files) {
        next if $file =~ /^$out_dir/;
        next if $file =~ /$0$/;
@@ -44,12 +45,26 @@ foreach my $file (@files) {
                        || die "Could not process file \"$file\": $!";
 
                my ($name,$path,$suffix) = fileparse($file,qw (.tt2));
-        make_path("$out_dir/$path") unless -d "$out_dir/$path";
-               open (my $fh, '>', "$out_dir/$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 {
-               fcopy ($file, "$out_dir/$file") or die "Could not copy $file to $out_dir/$file: $!";
+               fcopy ($file, "$tempdir/out/$file") or die "Could not copy $file to $tempdir/out/$file: $!";
        }
 }
+
+$out_dir =~ s/\/$//;
+if (-d $out_dir) {
+    dirmove ($out_dir, $out_dir . ".bak")
+        or die "Could not move $out_dir to $out_dir.bak: $!";
+}
+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);
+} else {
+       remove_tree($out_dir . ".bak");
+}