X-Git-Url: http://git.tremily.us/?a=blobdiff_plain;f=ikiwiki.in;h=ac43044dfcbb6b927de2f83081f9cb67ce6bd384;hb=430a2308133a2733f20c5e2f75b1eb974b8fdfa0;hp=ae1251ff6b3abe3925c59566709748935b83616a;hpb=60d2dd318f66563c3ee3bde950d7f53426530acc;p=ikiwiki.git

diff --git a/ikiwiki.in b/ikiwiki.in
index ae1251ff6..ac43044df 100755
--- 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}="" },
@@ -65,6 +66,9 @@ sub getconfig () {
 			"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]
 			},
@@ -93,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;