put ftemplate directive info under directives; new version of ftemplate, with LOOPS!

[ikiwiki.git] / ikiwiki.in

diff --git a/ikiwiki.in b/ikiwiki.in
index b62962ad8892841b9c28b0c649345514e493f5e1..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}="" },
@@ -103,8 +104,8 @@ sub getconfig () {
                                }
                                eval q{use YAML::Any};
                                eval q{use YAML} if $@;
-                               $YAML::Syck::ImplicitUnicode=1;
                                die $@ if $@;
+                               eval q{$YAML::Syck::ImplicitUnicode=1};
                                $config{$var}=Load($val."\n");
                        },
                        "version" => sub {