X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/1c00717cb2737bde3870b2fe504f40bb7d215477..484e42fd48f0bc6a1d9b7b27f2e5baf5a2ff8200:/ikiwiki.in

diff --git a/ikiwiki.in b/ikiwiki.in
index 8cb8a4769..4f24cfc2e 100755
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -10,7 +10,8 @@ use lib '.'; # For use in nonstandard directory, munged by Makefile.
 use IkiWiki;
 
 sub usage () { #{{{
-	die gettext("usage: ikiwiki [options] source dest"), "\n";
+	die gettext("usage: ikiwiki [options] source dest"), "\n",
+	    gettext("       ikiwiki --setup configfile"), "\n";
 } #}}}
 
 sub getconfig () { #{{{
@@ -19,7 +20,17 @@ sub getconfig () { #{{{
 		eval q{use Getopt::Long};
 		Getopt::Long::Configure('pass_through');
 		GetOptions(
-			"setup|s=s" => \$config{setup},
+			"setup|s=s" => sub {
+				require IkiWiki::Setup;
+				my $verbose=$config{verbose};
+				my $syslog=$config{syslog};
+				IkiWiki::Setup::load($_[1]);
+				$config{setupverbose}=$config{verbose};
+				$config{setupsyslog}=$config{syslog};
+				$config{verbose}=$verbose || $config{setupverbose};
+				$config{syslog}=$syslog;
+				$config{setup}=1;
+			},
 			"dumpsetup|s=s" => \$config{dumpsetup},
 			"wikiname=s" => \$config{wikiname},
 			"verbose|v!" => \$config{verbose},
@@ -84,14 +95,19 @@ sub getconfig () { #{{{
 				print "ikiwiki version $IkiWiki::version\n";
 				exit;
 			},
+			"help|h" => sub { $SIG{__WARN__}=sub {}; die },
 		) || usage();
 
 		if (! $config{setup} && ! $config{render}) {
 			loadplugins();
-			usage() unless @ARGV == 2;
-			$config{srcdir} = possibly_foolish_untaint(shift @ARGV);
-			$config{destdir} = possibly_foolish_untaint(shift @ARGV);
-			checkconfig();
+			if (@ARGV == 2) {
+				$config{srcdir} = possibly_foolish_untaint(shift @ARGV);
+				$config{destdir} = possibly_foolish_untaint(shift @ARGV);
+				checkconfig();
+			}
+			else {
+				usage() unless $config{dumpsetup};
+			}
 		}
 	}
 	else {
@@ -101,6 +117,7 @@ sub getconfig () { #{{{
 		if ($@) {
 			error("WRAPPED_OPTIONS: $@");
 		}
+		delete $ENV{WRAPPED_OPTIONS};
 		loadplugins();
 		checkconfig();
 	}
@@ -110,23 +127,23 @@ sub main () { #{{{
 	getconfig();
 	
 	if ($config{setup}) {
-		require IkiWiki::Setup;
-		IkiWiki::Setup::load($config{setup});
+		delete $config{setup};
+		loadplugins();
+		checkconfig();
+
 		if (@{$config{wrappers}} && 
 		    ! $config{render} && ! $config{dumpsetup} &&
 		    (! $config{refresh} || $config{genwrappers})) {
 			debug(gettext("generating wrappers.."));
 			require IkiWiki::Wrapper;
 			my %origconfig=(%config);
-			my @wrappers=@{$config{wrappers}};
-			delete $config{wrappers};
-			delete $config{genwrappers};
-			foreach my $wrapper (@wrappers) {
-				%config=(%origconfig,
-					rebuild => 0,
-					verbose => 0,
-					%{$wrapper},
-				);
+			foreach my $wrapper (@{$config{wrappers}}) {
+				%config=(%origconfig, %{$wrapper});
+				$config{verbose}=$config{setupverbose}
+					if exists $config{setupverbose};
+				$config{syslog}=$config{setupsyslog}
+					if exists $config{setupsyslog};
+				delete @config{qw(setupsyslog setupverbose wrappers genwrappers rebuild)};
 				checkconfig();
 				if (! $config{cgi} && ! $config{post_commit}) {
 					$config{post_commit}=1;
@@ -140,18 +157,12 @@ sub main () { #{{{
 		if (! $config{refresh}) {
 			$config{rebuild}=1;
 		}
-		
-		# ignore syslog setting from setup file
-		# while doing initial setup
-		$config{syslog}=0 unless $config{dumpsetup};
-		
-		loadplugins();
-		checkconfig();
 	}
 
 	if ($config{dumpsetup}) {
-		require IkiWiki::Setup::Standard;
-		IkiWiki::Setup::Standard::dump($config{dumpsetup});
+		$config{srdir}=$config{destdir}="";
+		require IkiWiki::Setup;
+		IkiWiki::Setup::dump($config{dumpsetup});
 	}
 	elsif ($config{wrapper}) {
 		lockwiki();
@@ -173,7 +184,7 @@ sub main () { #{{{
 		# do nothing
 	}
 	else {
-		if (! $config{refresh}) {
+		if ($config{rebuild}) {
 			debug(gettext("rebuilding wiki.."));
 		}
 		else {