releasing version 3.20091113

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

diff --git a/ikiwiki.in b/ikiwiki.in
index 60663bc89cdf8e0283da54a4d7f0014f627582dd..b8581d880eea398ac10a697c311f36428a18a67c 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}};
 
 $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;
 
 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";
        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};
        if (! exists $ENV{WRAPPED_OPTIONS}) {
                %config=defaultconfig();
                eval q{use Getopt::Long};


@@ -40,6 +40,7 @@ sub getconfig () { #{{{
                        "post-commit" => \$config{post_commit},
                        "render=s" => \$config{render},
                        "wrappers!" => \$config{genwrappers},
                        "post-commit" => \$config{post_commit},
                        "render=s" => \$config{render},
                        "wrappers!" => \$config{genwrappers},

+                       "wrappergroup=s" => \$config{wrappergroup},

                        "usedirs!" => \$config{usedirs},
                        "prefix-directives!" => \$config{prefix_directives},
                        "getctime" => \$config{getctime},
                        "usedirs!" => \$config{usedirs},
                        "prefix-directives!" => \$config{prefix_directives},
                        "getctime" => \$config{getctime},


@@ -98,7 +99,7 @@ sub getconfig () { #{{{
                        "help|h" => sub { $SIG{__WARN__}=sub {}; die },
                ) || usage();
 
                        "help|h" => sub { $SIG{__WARN__}=sub {}; die },
                ) || usage();
 

-               if (! $config{setup} && ! $config{render}) {
+               if (! $config{setup}) {

                        loadplugins();
                        if (@ARGV == 2) {
                                $config{srcdir} = possibly_foolish_untaint(shift @ARGV);
                        loadplugins();
                        if (@ARGV == 2) {
                                $config{srcdir} = possibly_foolish_untaint(shift @ARGV);


@@ -119,22 +120,12 @@ sub getconfig () { #{{{
                }
                delete $ENV{WRAPPED_OPTIONS};
 
                }
                delete $ENV{WRAPPED_OPTIONS};
 

-               if ($config{post_commit} && ! commit_hook_enabled()) {
-                       # optimisation for no-op post_commit 
-                       exit 0;
-               }
-               elsif ($config{test_receive}) {
-                       # quick success if the user is trusted
-                       require IkiWiki::Receive;
-                       exit 0 if IkiWiki::Receive::trusted();
-               }
-

                loadplugins();
                checkconfig();
        }
                loadplugins();
                checkconfig();
        }

-} #}}}
+}

 
 

-sub main () { #{{{
+sub main () {

        getconfig();
        
        if ($config{setup}) {
        getconfig();
        
        if ($config{setup}) {


@@ -144,7 +135,8 @@ sub main () { #{{{
 
                if (@{$config{wrappers}} && 
                    ! $config{render} && ! $config{dumpsetup} &&
 
                if (@{$config{wrappers}} && 
                    ! $config{render} && ! $config{dumpsetup} &&

-                   (! $config{refresh} || $config{genwrappers})) {
+                   ((! $config{refresh} && ! $config{post_commit})
+                    || $config{genwrappers})) {

                        debug(gettext("generating wrappers.."));
                        require IkiWiki::Wrapper;
                        my %origconfig=(%config);
                        debug(gettext("generating wrappers.."));
                        require IkiWiki::Wrapper;
                        my %origconfig=(%config);


@@ -156,7 +148,8 @@ sub main () { #{{{
                                        if exists $config{setupsyslog};
                                delete @config{qw(setupsyslog setupverbose wrappers genwrappers rebuild)};
                                checkconfig();
                                        if exists $config{setupsyslog};
                                delete @config{qw(setupsyslog setupverbose wrappers genwrappers rebuild)};
                                checkconfig();

-                               if (! $config{cgi} && ! $config{post_commit}) {
+                               if (! $config{cgi} && ! $config{post_commit} &&
+                                   ! $config{test_receive}) {

                                        $config{post_commit}=1;
                                }
                                gen_wrapper();
                                        $config{post_commit}=1;
                                }
                                gen_wrapper();


@@ -165,13 +158,16 @@ sub main () { #{{{
                }
                
                # setup implies a wiki rebuild by default
                }
                
                # setup implies a wiki rebuild by default

-               if (! $config{refresh}) {
+               if (! $config{refresh} && ! $config{render} &&
+                   ! $config{post_commit}) {

                        $config{rebuild}=1;
                }
        }
 
        if ($config{dumpsetup}) {
                        $config{rebuild}=1;
                }
        }
 
        if ($config{dumpsetup}) {

-               $config{srdir}=$config{destdir}="";
+               $config{srcdir}="" if ! defined $config{srcdir};
+               $config{destdir}="" if ! defined $config{destdir};
+               $config{syslog}=1 if $config{setupsyslog};

                require IkiWiki::Setup;
                IkiWiki::Setup::dump($config{dumpsetup});
        }
                require IkiWiki::Setup;
                IkiWiki::Setup::dump($config{dumpsetup});
        }


@@ -194,10 +190,6 @@ sub main () { #{{{
        elsif ($config{post_commit} && ! commit_hook_enabled()) {
                # do nothing
        }
        elsif ($config{post_commit} && ! commit_hook_enabled()) {
                # do nothing
        }

-       elsif ($config{test_receive}) {
-               require IkiWiki::Receive;
-               IkiWiki::Receive::test();
-       }

        else {
                if ($config{rebuild}) {
                        debug(gettext("rebuilding wiki.."));
        else {
                if ($config{rebuild}) {
                        debug(gettext("rebuilding wiki.."));


@@ -213,6 +205,6 @@ sub main () { #{{{
                saveindex();
                debug(gettext("done"));
        }
                saveindex();
                debug(gettext("done"));
        }

-} #}}}
+}

 
 main;
 
 main;