bugfix

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

diff --git a/ikiwiki.in b/ikiwiki.in
index 8066bbc6e096d0ab51a5fb72f97d642042e1ccaf..ac43044dfcbb6b927de2f83081f9cb67ce6bd384 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}};
 


@@ -7,31 +7,45 @@ package IkiWiki;
 use warnings;
 use strict;
 use lib '.'; # For use in nonstandard directory, munged by Makefile.
 use warnings;
 use strict;
 use lib '.'; # For use in nonstandard directory, munged by Makefile.

-use IkiWiki;
+use IkiWiki 3.00;

 
 

-sub usage () { #{{{
-       die gettext("usage: ikiwiki [options] source dest"), "\n";
-} #}}}
+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};
                Getopt::Long::Configure('pass_through');
                GetOptions(
        if (! exists $ENV{WRAPPED_OPTIONS}) {
                %config=defaultconfig();
                eval q{use Getopt::Long};
                Getopt::Long::Configure('pass_through');
                GetOptions(

-                       "setup|s=s" => \$config{setup},
+                       "setup|s=s" => sub {
+                               require IkiWiki::Setup;
+                               my $verbose=$config{verbose};
+                               my $syslog=$config{syslog};
+                               IkiWiki::Setup::load($_[1]);
+                               $config{setupverbose}=$config{verbose};
+                               $config{setupsyslog}=$config{syslog};
+                               $config{verbose}=$verbose || $config{setupverbose};
+                               $config{syslog}=$syslog;
+                               $config{setup}=1;
+                       },

                        "dumpsetup|s=s" => \$config{dumpsetup},
                        "wikiname=s" => \$config{wikiname},
                        "verbose|v!" => \$config{verbose},
                        "syslog!" => \$config{syslog},
                        "rebuild!" => \$config{rebuild},
                        "refresh!" => \$config{refresh},
                        "dumpsetup|s=s" => \$config{dumpsetup},
                        "wikiname=s" => \$config{wikiname},
                        "verbose|v!" => \$config{verbose},
                        "syslog!" => \$config{syslog},
                        "rebuild!" => \$config{rebuild},
                        "refresh!" => \$config{refresh},

+                       "clean!" => \$config{clean},

                        "post-commit" => \$config{post_commit},
                        "render=s" => \$config{render},
                        "post-commit" => \$config{post_commit},
                        "render=s" => \$config{render},

-                       "wrappers!" => \$config{wrappers},
+                       "wrappers!" => \$config{genwrappers},
+                       "wrappergroup=s" => \$config{wrappergroup},

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

-                       "getctime" => \$config{getctime},
+                       "getctime" => \$config{gettime},
+                       "gettime!" => \$config{gettime},

                        "numbacklinks=i" => \$config{numbacklinks},
                        "rcs=s" => \$config{rcs},
                        "no-rcs" => sub { $config{rcs}="" },
                        "numbacklinks=i" => \$config{numbacklinks},
                        "rcs=s" => \$config{rcs},
                        "no-rcs" => sub { $config{rcs}="" },


@@ -46,13 +60,15 @@ sub getconfig () { #{{{
                        "adminemail=s" => \$config{adminemail},
                        "timeformat=s" => \$config{timeformat},
                        "sslcookie!" => \$config{sslcookie},
                        "adminemail=s" => \$config{adminemail},
                        "timeformat=s" => \$config{timeformat},
                        "sslcookie!" => \$config{sslcookie},

-                       "httpauth!" => \$config{httpauth},

                        "userdir=s" => \$config{userdir},
                        "htmlext=s" => \$config{htmlext},
                        "libdir=s" => \$config{libdir},
                        "exclude=s@" => sub {
                                push @{$config{wiki_file_prune_regexps}}, $_[1];
                        },
                        "userdir=s" => \$config{userdir},
                        "htmlext=s" => \$config{htmlext},
                        "libdir=s" => \$config{libdir},
                        "exclude=s@" => sub {
                                push @{$config{wiki_file_prune_regexps}}, $_[1];
                        },

+                       "include=s@" => sub {
+                               $config{include}=defined $config{include} && length $config{include} ? "$config{include}|$_[1]" : $_[1];
+                       },

                        "adminuser=s@" => sub {
                                push @{$config{adminuser}}, $_[1]
                        },
                        "adminuser=s@" => sub {
                                push @{$config{adminuser}}, $_[1]
                        },


@@ -69,7 +85,7 @@ sub getconfig () { #{{{
                                $config{wrappermode}=possibly_foolish_untaint($_[1])
                        },
                        "plugin=s@" => sub {
                                $config{wrappermode}=possibly_foolish_untaint($_[1])
                        },
                        "plugin=s@" => sub {

-                               push @{$config{plugin}}, $_[1];
+                               push @{$config{add_plugins}}, $_[1];

                        },
                        "disable-plugin=s@" => sub {
                                push @{$config{disable_plugins}}, $_[1];
                        },
                        "disable-plugin=s@" => sub {
                                push @{$config{disable_plugins}}, $_[1];


@@ -81,18 +97,34 @@ sub getconfig () { #{{{
                                }
                                $config{$var}=$val;
                        },
                                }
                                $config{$var}=$val;
                        },

+                       "set-yaml=s" => sub {
+                               my ($var, $val)=split('=', $_[1], 2);
+                               if (! defined $var || ! defined $val) {
+                                       die gettext("usage: --set-yaml var=value"), "\n";
+                               }
+                               eval q{use YAML::Any};
+                               eval q{use YAML} if $@;
+                               die $@ if $@;
+                               eval q{$YAML::Syck::ImplicitUnicode=1};
+                               $config{$var}=Load($val."\n");
+                       },

                        "version" => sub {
                                print "ikiwiki version $IkiWiki::version\n";
                                exit;
                        },
                        "version" => sub {
                                print "ikiwiki version $IkiWiki::version\n";
                                exit;
                        },

+                       "help|h" => sub { $SIG{__WARN__}=sub {}; die },

                ) || usage();
 
                ) || usage();
 

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

                        loadplugins();
                        loadplugins();

-                       usage() unless @ARGV == 2;
-                       $config{srcdir} = possibly_foolish_untaint(shift @ARGV);
-                       $config{destdir} = possibly_foolish_untaint(shift @ARGV);
-                       checkconfig();
+                       if (@ARGV == 2) {
+                               $config{srcdir} = possibly_foolish_untaint(shift @ARGV);
+                               $config{destdir} = possibly_foolish_untaint(shift @ARGV);
+                               checkconfig();
+                       }
+                       else {
+                               usage() unless $config{dumpsetup};
+                       }

                }
        }
        else {
                }
        }
        else {


@@ -102,32 +134,39 @@ sub getconfig () { #{{{
                if ($@) {
                        error("WRAPPED_OPTIONS: $@");
                }
                if ($@) {
                        error("WRAPPED_OPTIONS: $@");
                }

+               delete $ENV{WRAPPED_OPTIONS};
+

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

-} #}}}
+}

 
 

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

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

-               require IkiWiki::Setup;
-               IkiWiki::Setup::load($config{setup});
-               if (! $config{render} && ! $config{dumpsetup} &&
-                   (! $config{refresh} || $config{wrappers})) {
+               delete $config{setup};
+               loadplugins();
+               checkconfig();
+
+               if (@{$config{wrappers}} && 
+                   ! $config{render} && ! $config{dumpsetup} &&
+                   ! $config{clean} &&
+                   ((! $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);

-                       my @wrappers=@{$config{wrappers}};
-                       delete $config{wrappers};
-                       foreach my $wrapper (@wrappers) {
-                               %config=(%origconfig,
-                                       rebuild => 0,
-                                       verbose => 0,
-                                       %{$wrapper},
-                               );
+                       foreach my $wrapper (@{$config{wrappers}}) {
+                               %config=(%origconfig, %{$wrapper});
+                               $config{verbose}=$config{setupverbose}
+                                       if exists $config{setupverbose};
+                               $config{syslog}=$config{setupsyslog}
+                                       if exists $config{setupsyslog};
+                               delete @config{qw(setupsyslog setupverbose wrappers genwrappers rebuild)};

                                checkconfig();
                                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();


@@ -136,21 +175,18 @@ 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{clean}) {

                        $config{rebuild}=1;
                }
                        $config{rebuild}=1;
                }

-               
-               # ignore syslog setting from setup file
-               # while doing initial setup
-               $config{syslog}=0;      
-               
-               loadplugins();
-               checkconfig();

        }
 
        if ($config{dumpsetup}) {
        }
 
        if ($config{dumpsetup}) {

-               require IkiWiki::Setup::Standard;
-               IkiWiki::Setup::Standard::dump($config{dumpsetup});
+               $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});

        }
        elsif ($config{wrapper}) {
                lockwiki();
        }
        elsif ($config{wrapper}) {
                lockwiki();


@@ -171,8 +207,16 @@ sub main () { #{{{
        elsif ($config{post_commit} && ! commit_hook_enabled()) {
                # do nothing
        }
        elsif ($config{post_commit} && ! commit_hook_enabled()) {
                # do nothing
        }

+       elsif ($config{clean}) {
+               require IkiWiki::Render;
+               foreach my $wrapper (@{$config{wrappers}}) {
+                       prune($wrapper->{wrapper});
+               }
+               clean_rendered();
+               system("rm", "-rf", $config{wikistatedir});
+       }

        else {
        else {

-               if (! $config{refresh}) {
+               if ($config{rebuild}) {

                        debug(gettext("rebuilding wiki.."));
                }
                else {
                        debug(gettext("rebuilding wiki.."));
                }
                else {


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

-} #}}}
+}

 
 main;
 
 main;