fix duplicate expansion of comments

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

diff --git a/ikiwiki.in b/ikiwiki.in
index bcda2469b515c33a8df91536da895f28841574b3..1327d70e13273f0692ea1b5957063ddaf2a26402 100755 (executable)
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -1,7 +1,4 @@
 #!/usr/bin/perl
-$ENV{PATH}="/usr/local/bin:/usr/bin:/bin";
-delete @ENV{qw{IFS CDPATH ENV BASH_ENV}};
-
 package IkiWiki;
 
 use warnings;
@@ -11,7 +8,7 @@ use IkiWiki 3.00;
 
 sub usage () {
        die gettext("usage: ikiwiki [options] source dest"), "\n",
-           gettext("       ikiwiki --setup configfile"), "\n";
+           gettext("       ikiwiki --setup my.setup [options]"), "\n";
 }
 
 sub setup (@) {
@@ -111,11 +108,9 @@ sub getconfig () {
                                if (! defined $var || ! defined $val) {
                                        die gettext("usage: --set-yaml var=value"), "\n";
                                }
-                               eval q{use YAML::Any};
-                               eval q{use YAML} if $@;
+                               eval q{use YAML::XS; use Encode};
                                die $@ if $@;
-                               eval q{$YAML::Syck::ImplicitUnicode=1};
-                               $config{$var}=Load($val."\n");
+                               $config{$var}=Load(encode_utf8($val)."\n");
                        },
                        "version" => sub {
                                print "ikiwiki version $IkiWiki::version\n";
@@ -183,6 +178,7 @@ sub main () {
                $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});
        }