Merge branch 'master' into commentreorg

[ikiwiki.git] / ikiwiki.in

diff --git a/ikiwiki.in b/ikiwiki.in
index da5555629bbfd6bd1ff378752c2952d978c5feb3..ac43044dfcbb6b927de2f83081f9cb67ce6bd384 100755 (executable)
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -7,7 +7,7 @@ package IkiWiki;
 use warnings;
 use strict;
 use lib '.'; # For use in nonstandard directory, munged by Makefile.
-use IkiWiki;
+use IkiWiki 3.00;
 
 sub usage () {
        die gettext("usage: ikiwiki [options] source dest"), "\n",
@@ -44,7 +44,8 @@ sub getconfig () {
                        "wrappergroup=s" => \$config{wrappergroup},
                        "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}="" },
@@ -96,6 +97,17 @@ sub getconfig () {
                                }
                                $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;