Revert spam

[git.ikiwiki.info.git] / ikiwiki.in

diff --git a/ikiwiki.in b/ikiwiki.in
index 473cbdbfd059351afe086257909ff1b8dc4f1da5..ae1251ff6b3abe3925c59566709748935b83616a 100755 (executable)
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -T
+#!/usr/bin/perl
 $ENV{PATH}="/usr/local/bin:/usr/bin:/bin";
 delete @ENV{qw{IFS CDPATH ENV BASH_ENV}};
 
@@ -9,12 +9,12 @@ use strict;
 use lib '.'; # For use in nonstandard directory, munged by Makefile.
 use IkiWiki;
 
-sub usage () { #{{{
+sub usage () {
        die gettext("usage: ikiwiki [options] source dest"), "\n",
            gettext("       ikiwiki --setup configfile"), "\n";
-} #}}}
+}
 
-sub getconfig () { #{{{
+sub getconfig () {
        if (! exists $ENV{WRAPPED_OPTIONS}) {
                %config=defaultconfig();
                eval q{use Getopt::Long};
@@ -37,6 +37,7 @@ sub getconfig () { #{{{
                        "syslog!" => \$config{syslog},
                        "rebuild!" => \$config{rebuild},
                        "refresh!" => \$config{refresh},
+                       "clean!" => \$config{clean},
                        "post-commit" => \$config{post_commit},
                        "render=s" => \$config{render},
                        "wrappers!" => \$config{genwrappers},
@@ -123,9 +124,9 @@ sub getconfig () { #{{{
                loadplugins();
                checkconfig();
        }
-} #}}}
+}
 
-sub main () { #{{{
+sub main () {
        getconfig();
        
        if ($config{setup}) {
@@ -135,7 +136,9 @@ sub main () { #{{{
 
                if (@{$config{wrappers}} && 
                    ! $config{render} && ! $config{dumpsetup} &&
-                   (! $config{refresh} || $config{genwrappers})) {
+                   ! $config{clean} &&
+                   ((! $config{refresh} && ! $config{post_commit})
+                    || $config{genwrappers})) {
                        debug(gettext("generating wrappers.."));
                        require IkiWiki::Wrapper;
                        my %origconfig=(%config);
@@ -157,7 +160,8 @@ sub main () { #{{{
                }
                
                # setup implies a wiki rebuild by default
-               if (! $config{refresh} && ! $config{render}) {
+               if (! $config{refresh} && ! $config{render} &&
+                   ! $config{post_commit} && ! $config{clean}) {
                        $config{rebuild}=1;
                }
        }
@@ -188,9 +192,13 @@ sub main () { #{{{
        elsif ($config{post_commit} && ! commit_hook_enabled()) {
                # do nothing
        }
-       elsif ($config{test_receive}) {
-               require IkiWiki::Receive;
-               IkiWiki::Receive::test();
+       elsif ($config{clean}) {
+               require IkiWiki::Render;
+               foreach my $wrapper (@{$config{wrappers}}) {
+                       prune($wrapper->{wrapper});
+               }
+               clean_rendered();
+               system("rm", "-rf", $config{wikistatedir});
        }
        else {
                if ($config{rebuild}) {
@@ -207,6 +215,6 @@ sub main () { #{{{
                saveindex();
                debug(gettext("done"));
        }
-} #}}}
+}
 
 main;