X-Git-Url: http://git.tremily.us/?a=blobdiff_plain;f=ikiwiki.in;h=32a24af84a6177d0477bc1914afcddd41b2627cc;hb=9bee6db8c604efd705d6d808fca3194eb4873cf4;hp=344b881489de4c31865a4abb610be4ddef2f0fa3;hpb=96ff36b872f65801332c628d23b9f851b058823d;p=ikiwiki.git diff --git a/ikiwiki.in b/ikiwiki.in index 344b88148..32a24af84 100755 --- a/ikiwiki.in +++ b/ikiwiki.in @@ -9,12 +9,12 @@ use strict; use lib '.'; # For use in nonstandard directory, munged by Makefile. use IkiWiki; -sub usage () { #{{{ +sub usage () { die gettext("usage: ikiwiki [options] source dest"), "\n", gettext(" ikiwiki --setup configfile"), "\n"; -} #}}} +} -sub getconfig () { #{{{ +sub getconfig () { if (! exists $ENV{WRAPPED_OPTIONS}) { %config=defaultconfig(); eval q{use Getopt::Long}; @@ -123,9 +123,9 @@ sub getconfig () { #{{{ loadplugins(); checkconfig(); } -} #}}} +} -sub main () { #{{{ +sub main () { getconfig(); if ($config{setup}) { @@ -163,7 +163,8 @@ sub main () { #{{{ } if ($config{dumpsetup}) { - $config{srdir}=$config{destdir}=""; + $config{srcdir}="" if ! defined $config{srcdir}; + $config{destdir}="" if ! defined $config{destdir}; $config{syslog}=1 if $config{setupsyslog}; require IkiWiki::Setup; IkiWiki::Setup::dump($config{dumpsetup}); @@ -206,6 +207,6 @@ sub main () { #{{{ saveindex(); debug(gettext("done")); } -} #}}} +} main;