* Added created_before and created_after PageSpec limits.

[git.ikiwiki.info.git] / ikiwiki

diff --git a/ikiwiki b/ikiwiki
index 61b66374de58924d081218292289c777306e8e0d..1342ec543f3e54c216e16cb615e9493c67484e8a 100755 (executable)
--- a/ikiwiki
+++ b/ikiwiki
@@ -1,5 +1,6 @@
-#!/usr/bin/perl -T -CSD
+#!/usr/bin/perl -T

 $ENV{PATH}="/usr/local/bin:/usr/bin:/bin";
 $ENV{PATH}="/usr/local/bin:/usr/bin:/bin";

+delete @ENV{qw{IFS CDPATH ENV BASH_ENV}};

 
 package IkiWiki;
 use warnings;
 
 package IkiWiki;
 use warnings;


@@ -15,12 +16,14 @@ 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};

+               Getopt::Long::Configure('pass_through');

                GetOptions(
                        "setup|s=s" => \$config{setup},
                        "wikiname=s" => \$config{wikiname},
                        "verbose|v!" => \$config{verbose},
                        "rebuild!" => \$config{rebuild},
                        "refresh!" => \$config{refresh},
                GetOptions(
                        "setup|s=s" => \$config{setup},
                        "wikiname=s" => \$config{wikiname},
                        "verbose|v!" => \$config{verbose},
                        "rebuild!" => \$config{rebuild},
                        "refresh!" => \$config{refresh},

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

                        "getctime" => \$config{getctime},
                        "wrappermode=i" => \$config{wrappermode},
                        "rcs=s" => \$config{rcs},
                        "getctime" => \$config{getctime},
                        "wrappermode=i" => \$config{wrappermode},
                        "rcs=s" => \$config{rcs},


@@ -29,6 +32,7 @@ sub getconfig () { #{{{
                        "rss!" => \$config{rss},
                        "cgi!" => \$config{cgi},
                        "discussion!" => \$config{discussion},
                        "rss!" => \$config{rss},
                        "cgi!" => \$config{cgi},
                        "discussion!" => \$config{discussion},

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

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


@@ -57,11 +61,15 @@ 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}) {

+                       loadplugins();

                        usage() unless @ARGV == 2;
                        $config{srcdir} = possibly_foolish_untaint(shift @ARGV);
                        $config{destdir} = possibly_foolish_untaint(shift @ARGV);
                        usage() unless @ARGV == 2;
                        $config{srcdir} = possibly_foolish_untaint(shift @ARGV);
                        $config{destdir} = possibly_foolish_untaint(shift @ARGV);


@@ -75,6 +83,7 @@ sub getconfig () { #{{{
                if ($@) {
                        error("WRAPPED_OPTIONS: $@");
                }
                if ($@) {
                        error("WRAPPED_OPTIONS: $@");
                }

+               loadplugins();

                checkconfig();
        }
 } #}}}
                checkconfig();
        }
 } #}}}