web commit by intrigeri: bug submission

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

diff --git a/ikiwiki.in b/ikiwiki.in
index 7d13ab455c60dd80a743d6fb519d1400b9e02b4b..e0a59182422ae0d2aaa1b69d15fa3463f144d9c8 100755 (executable)
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -10,7 +10,7 @@ use lib '.'; # For use in nonstandard directory, munged by Makefile.
 use IkiWiki;
 
 sub usage () { #{{{
 use IkiWiki;
 
 sub usage () { #{{{

-       die "usage: ikiwiki [options] source dest\n";
+       die gettext("usage: ikiwiki [options] source dest"), "\n";

 } #}}}
 
 sub getconfig () { #{{{
 } #}}}
 
 sub getconfig () { #{{{


@@ -25,31 +25,32 @@ sub getconfig () { #{{{
                        "syslog!" => \$config{syslog},
                        "rebuild!" => \$config{rebuild},
                        "refresh!" => \$config{refresh},
                        "syslog!" => \$config{syslog},
                        "rebuild!" => \$config{rebuild},
                        "refresh!" => \$config{refresh},

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

                        "render=s" => \$config{render},
                        "wrappers!" => \$config{wrappers},
                        "render=s" => \$config{render},
                        "wrappers!" => \$config{wrappers},

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

                        "getctime" => \$config{getctime},
                        "getctime" => \$config{getctime},

-                       "wrappermode=i" => \$config{wrappermode},
+                       "numbacklinks=i" => \$config{numbacklinks},

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

-                       "anonok!" => \$config{anonok},
-                       "rss!" => \$config{rss},
-                       "atom!" => \$config{atom},

                        "cgi!" => \$config{cgi},
                        "discussion!" => \$config{discussion},
                        "w3mmode!" => \$config{w3mmode},
                        "cgi!" => \$config{cgi},
                        "discussion!" => \$config{discussion},
                        "w3mmode!" => \$config{w3mmode},

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

                        "url=s" => \$config{url},
                        "cgiurl=s" => \$config{cgiurl},
                        "historyurl=s" => \$config{historyurl},
                        "diffurl=s" => \$config{diffurl},
                        "url=s" => \$config{url},
                        "cgiurl=s" => \$config{cgiurl},
                        "historyurl=s" => \$config{historyurl},
                        "diffurl=s" => \$config{diffurl},

-                       "svnrepo" => \$config{svnrepo},

                        "svnpath" => \$config{svnpath},
                        "adminemail=s" => \$config{adminemail},
                        "timeformat=s" => \$config{timeformat},
                        "sslcookie!" => \$config{sslcookie},
                        "httpauth!" => \$config{httpauth},
                        "svnpath" => \$config{svnpath},
                        "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 {
                        "exclude=s@" => sub {

-                               $config{wiki_file_prune_regexp}=qr/$config{wiki_file_prune_regexp}|$_[1]/;
+                               push @{$config{wiki_file_prune_regexps}}, $_[1];

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


@@ -61,17 +62,27 @@ sub getconfig () { #{{{
                                $config{underlaydir}=possibly_foolish_untaint($_[1])
                        },
                        "wrapper:s" => sub {
                                $config{underlaydir}=possibly_foolish_untaint($_[1])
                        },
                        "wrapper:s" => sub {

-                               $config{wrapper}=$_[1] ? $_[1] : "ikiwiki-wrap"
+                               $config{wrapper}=$_[1] ? possibly_foolish_untaint($_[1]) : "ikiwiki-wrap"
+                       },
+                       "wrappermode=i" => sub {
+                               $config{wrappermode}=possibly_foolish_untaint($_[1])

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

-                               $config{plugin}=[grep { $_ ne $_[1] } @{$config{plugin}}];
+                               push @{$config{disable_plugins}}, $_[1];

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

+                       "set=s" => sub {
+                               my ($var, $val)=split('=', $_[1], 2);
+                               if (! defined $var || ! defined $val) {
+                                       die gettext("usage: --set var=value"), "\n";
+                               }
+                               $config{$var}=$val;
+                       },

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


@@ -101,12 +112,7 @@ sub getconfig () { #{{{
 sub main () { #{{{
        getconfig();
        
 sub main () { #{{{
        getconfig();
        

-       if ($config{cgi}) {
-               loadindex();
-               require IkiWiki::CGI;
-               cgi();
-       }
-       elsif ($config{setup}) {
+       if ($config{setup}) {

                require IkiWiki::Setup;
                setup();
        }
                require IkiWiki::Setup;
                setup();
        }


@@ -115,17 +121,23 @@ sub main () { #{{{
                require IkiWiki::Wrapper;
                gen_wrapper();
        }
                require IkiWiki::Wrapper;
                gen_wrapper();
        }

+       elsif ($config{cgi}) {
+               require IkiWiki::CGI;
+               cgi();
+       }

        elsif ($config{render}) {
                require IkiWiki::Render;
                commandline_render();
        }
        elsif ($config{render}) {
                require IkiWiki::Render;
                commandline_render();
        }

+       elsif ($config{post_commit} && ! commit_hook_enabled()) {
+               # do nothing
+       }

        else {
                lockwiki();
                loadindex();
                require IkiWiki::Render;
                rcs_update();
                refresh();
        else {
                lockwiki();
                loadindex();
                require IkiWiki::Render;
                rcs_update();
                refresh();

-               rcs_notify() if $config{notify};

                saveindex();
        }
 } #}}}
                saveindex();
        }
 } #}}}