releasing version 3.20120115

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

diff --git a/ikiwiki.in b/ikiwiki.in
index 973ae3b3181df334c3b090d1fb433c326d4748d9..adff1411e8aa715a192f3850a7aef59f4cd04f0b 100755 (executable)
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -1,48 +1,56 @@
-#!/usr/bin/perl -T
-$ENV{PATH}="/usr/local/bin:/usr/bin:/bin";
-delete @ENV{qw{IFS CDPATH ENV BASH_ENV}};
-
+#!/usr/bin/perl

 package IkiWiki;
 
 use warnings;
 use strict;
 use lib '.'; # For use in nonstandard directory, munged by Makefile.
 package IkiWiki;
 
 use warnings;
 use strict;
 use lib '.'; # For use in nonstandard directory, munged by Makefile.

-use IkiWiki;
+use IkiWiki 3.00;

 
 

-sub usage () { #{{{
+sub usage () {

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

-} #}}}
+}
+
+sub setup (@) {
+       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;
+}

 
 

-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" => 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;
-                       },
+                       "setup|s=s" => \&setup,

                        "dumpsetup|s=s" => \$config{dumpsetup},
                        "dumpsetup|s=s" => \$config{dumpsetup},

+                       "changesetup|s=s" => sub {
+                               $config{changesetup}=$_[1];
+                               $config{genwrappers}=1;
+                               $config{refresh}=1;
+                               setup(@_);
+                       },

                        "wikiname=s" => \$config{wikiname},
                        "verbose|v!" => \$config{verbose},
                        "syslog!" => \$config{syslog},
                        "rebuild!" => \$config{rebuild},
                        "refresh!" => \$config{refresh},
                        "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},
                        "wrappers!" => \$config{genwrappers},
                        "post-commit" => \$config{post_commit},
                        "render=s" => \$config{render},
                        "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}="" },


@@ -63,6 +71,9 @@ sub getconfig () { #{{{
                        "exclude=s@" => sub {
                                push @{$config{wiki_file_prune_regexps}}, $_[1];
                        },
                        "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]
                        },


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

-                               push @{$config{add_plugins}}, $_[1];
+                               push @{$config{add_plugins}}, $_[1]
+                                       unless grep { $_ eq $_[1] } @{$config{add_plugins}};

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


@@ -91,6 +103,17 @@ 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;


@@ -98,7 +121,7 @@ sub getconfig () { #{{{
                        "help|h" => sub { $SIG{__WARN__}=sub {}; die },
                ) || usage();
 
                        "help|h" => sub { $SIG{__WARN__}=sub {}; die },
                ) || usage();
 

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

                        loadplugins();
                        if (@ARGV == 2) {
                                $config{srcdir} = possibly_foolish_untaint(shift @ARGV);
                        loadplugins();
                        if (@ARGV == 2) {
                                $config{srcdir} = possibly_foolish_untaint(shift @ARGV);


@@ -118,12 +141,13 @@ sub getconfig () { #{{{
                        error("WRAPPED_OPTIONS: $@");
                }
                delete $ENV{WRAPPED_OPTIONS};
                        error("WRAPPED_OPTIONS: $@");
                }
                delete $ENV{WRAPPED_OPTIONS};

+

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

-} #}}}
+}

 
 

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

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


@@ -133,34 +157,30 @@ sub main () { #{{{
 
                if (@{$config{wrappers}} && 
                    ! $config{render} && ! $config{dumpsetup} &&
 
                if (@{$config{wrappers}} && 
                    ! $config{render} && ! $config{dumpsetup} &&

-                   (! $config{refresh} || $config{genwrappers})) {
-                       debug(gettext("generating wrappers.."));
+                   ! $config{clean} &&
+                   ((! $config{refresh} && ! $config{post_commit})
+                    || $config{genwrappers})) {

                        require IkiWiki::Wrapper;
                        require IkiWiki::Wrapper;

-                       my %origconfig=(%config);
-                       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();
-                               if (! $config{cgi} && ! $config{post_commit}) {
-                                       $config{post_commit}=1;
-                               }
-                               gen_wrapper();
-                       }
-                       %config=(%origconfig);
+                       gen_wrappers();

                }
                
                # 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;
                }
        }
 

+       if ($config{changesetup}) {
+               require IkiWiki::Setup;
+               IkiWiki::Setup::dump($config{changesetup});
+       }
+

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

-               $config{srdir}=$config{destdir}="";
+               $config{srcdir}="" if ! defined $config{srcdir};
+               $config{destdir}="" if ! defined $config{destdir};
+               $config{syslog}=1 if $config{setupsyslog};
+               checkconfig();

                require IkiWiki::Setup;
                IkiWiki::Setup::dump($config{dumpsetup});
        }
                require IkiWiki::Setup;
                IkiWiki::Setup::dump($config{dumpsetup});
        }


@@ -183,8 +203,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{rebuild}}) {
+               if ($config{rebuild}) {

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


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

-} #}}}
+}

 
 main;
 
 main;