X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/170e930f9d29039a4f8d385ec3bd9850c1cf95fa..8d4342183b1c3a96797def6fff96feebacb90db6:/ikiwiki.in?ds=sidebyside

diff --git a/ikiwiki.in b/ikiwiki.in
index bcda2469b..30df628b2 100755
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -1,17 +1,15 @@
 #!/usr/bin/perl
-$ENV{PATH}="/usr/local/bin:/usr/bin:/bin";
-delete @ENV{qw{IFS CDPATH ENV BASH_ENV}};
-
 package IkiWiki;
 
+no lib '.';
 use warnings;
 use strict;
-use lib '.'; # For use in nonstandard directory, munged by Makefile.
+use FindBin; use lib $FindBin::Bin; # For use in nonstandard directory, munged by Makefile.
 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 +109,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 +179,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});
 	}