fix

[git.ikiwiki.info.git] / ikiwiki

diff --git a/ikiwiki b/ikiwiki
index e911eaff4de483cb9e1ffe680828b13ab91f6d2d..099a821b7ad9fe7afebf53634edb34f49ab85671 100755 (executable)
--- a/ikiwiki
+++ b/ikiwiki
@@ -28,6 +28,7 @@ sub getconfig () { #{{{
                        "anonok!" => \$config{anonok},
                        "rss!" => \$config{rss},
                        "cgi!" => \$config{cgi},
                        "anonok!" => \$config{anonok},
                        "rss!" => \$config{rss},
                        "cgi!" => \$config{cgi},

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

                        "notify!" => \$config{notify},
                        "url=s" => \$config{url},
                        "cgiurl=s" => \$config{cgiurl},
                        "notify!" => \$config{notify},
                        "url=s" => \$config{url},
                        "cgiurl=s" => \$config{cgiurl},


@@ -36,6 +37,7 @@ sub getconfig () { #{{{
                        "svnrepo" => \$config{svnrepo},
                        "svnpath" => \$config{svnpath},
                        "adminemail=s" => \$config{adminemail},
                        "svnrepo" => \$config{svnrepo},
                        "svnpath" => \$config{svnpath},
                        "adminemail=s" => \$config{adminemail},

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

                        "exclude=s@" => sub {
                                $config{wiki_file_prune_regexp}=qr/$config{wiki_file_prune_regexp}|$_[1]/;
                        },
                        "exclude=s@" => sub {
                                $config{wiki_file_prune_regexp}=qr/$config{wiki_file_prune_regexp}|$_[1]/;
                        },


@@ -55,8 +57,11 @@ sub getconfig () { #{{{
                                push @{$config{plugin}}, $_[1];
                        },
                        "disable-plugin=s@" => sub {
                                push @{$config{plugin}}, $_[1];
                        },
                        "disable-plugin=s@" => sub {

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

                        },
                        },

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

                ) || usage();
 
                if (! $config{setup}) {
                ) || usage();
 
                if (! $config{setup}) {


@@ -100,7 +105,6 @@ sub main () { #{{{
                loadindex();
                require IkiWiki::Render;
                rcs_update();
                loadindex();
                require IkiWiki::Render;
                rcs_update();

-               rcs_getctime() if $config{getctime};

                refresh();
                rcs_notify() if $config{notify};
                saveindex();
                refresh();
                rcs_notify() if $config{notify};
                saveindex();