fix

[git.ikiwiki.info.git] / ikiwiki

diff --git a/ikiwiki b/ikiwiki
index 745dfddd4ca870376844d913516d5962e2682f8e..099a821b7ad9fe7afebf53634edb34f49ab85671 100755 (executable)
--- a/ikiwiki
+++ b/ikiwiki
@@ -13,42 +13,7 @@ sub usage () { #{{{
 
 sub getconfig () { #{{{
        if (! exists $ENV{WRAPPED_OPTIONS}) {
 
 sub getconfig () { #{{{
        if (! exists $ENV{WRAPPED_OPTIONS}) {

-               %config=(
-                       wiki_file_prune_regexp => qr{((^|/).svn/|\.\.|^\.|\/\.|\.html?$|\.rss$)},
-                       wiki_link_regexp => qr/\[\[(?:([^\s\]\|]+)\|)?([^\s\]]+)\]\]/,
-                       wiki_processor_regexp => qr/\[\[(\w+)\s+([^\]]*)\]\]/,
-                       wiki_file_regexp => qr/(^[-[:alnum:]_.:\/+]+$)/,
-                       verbose => 0,
-                       wikiname => "wiki",
-                       default_pageext => ".mdwn",
-                       cgi => 0,
-                       rcs => 'svn',
-                       notify => 0,
-                       url => '',
-                       cgiurl => '',
-                       historyurl => '',
-                       diffurl => '',
-                       anonok => 0,
-                       rss => 0,
-                       sanitize => 1,
-                       rebuild => 0,
-                       refresh => 0,
-                       getctime => 0,
-                       wrapper => undef,
-                       wrappermode => undef,
-                       svnrepo => undef,
-                       svnpath => "trunk",
-                       srcdir => undef,
-                       destdir => undef,
-                       templatedir => "/usr/share/ikiwiki/templates",
-                       underlaydir => "/usr/share/ikiwiki/basewiki",
-                       setup => undef,
-                       adminuser => undef,
-                       adminemail => undef,
-                       plugin => [qw{inline}],
-                       headercontent => '',
-               );
-
+               %config=defaultconfig();

                eval q{use Getopt::Long};
                GetOptions(
                        "setup|s=s" => \$config{setup},
                eval q{use Getopt::Long};
                GetOptions(
                        "setup|s=s" => \$config{setup},


@@ -63,8 +28,8 @@ 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},
                        "notify!" => \$config{notify},

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

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


@@ -72,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]/;
                        },


@@ -89,6 +55,12 @@ sub getconfig () { #{{{
                        },
                        "plugin=s@" => sub {
                                push @{$config{plugin}}, $_[1];
                        },
                        "plugin=s@" => sub {
                                push @{$config{plugin}}, $_[1];

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

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


@@ -133,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();