X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/241c08844dc103c82064227e463f5558b37df9a1..cdf7dcfc6ed392de4f4b8a3b2f95f121435ebacf:/ikiwiki.in?ds=sidebyside

diff --git a/ikiwiki.in b/ikiwiki.in
index beb405227..32a24af84 100755
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -9,17 +9,28 @@ use strict;
 use lib '.'; # For use in nonstandard directory, munged by Makefile.
 use IkiWiki;
 
-sub usage () { #{{{
-	die gettext("usage: ikiwiki [options] source dest"), "\n";
-} #}}}
+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};
 		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},
@@ -29,6 +40,7 @@ sub getconfig () { #{{{
 			"post-commit" => \$config{post_commit},
 			"render=s" => \$config{render},
 			"wrappers!" => \$config{genwrappers},
+			"wrappergroup=s" => \$config{wrappergroup},
 			"usedirs!" => \$config{usedirs},
 			"prefix-directives!" => \$config{prefix_directives},
 			"getctime" => \$config{getctime},
@@ -84,9 +96,10 @@ sub getconfig () { #{{{
 				print "ikiwiki version $IkiWiki::version\n";
 				exit;
 			},
+			"help|h" => sub { $SIG{__WARN__}=sub {}; die },
 		) || usage();
 
-		if (! $config{setup} && ! $config{render}) {
+		if (! $config{setup}) {
 			loadplugins();
 			if (@ARGV == 2) {
 				$config{srcdir} = possibly_foolish_untaint(shift @ARGV);
@@ -105,18 +118,18 @@ sub getconfig () { #{{{
 		if ($@) {
 			error("WRAPPED_OPTIONS: $@");
 		}
+		delete $ENV{WRAPPED_OPTIONS};
+
 		loadplugins();
 		checkconfig();
 	}
-} #}}}
+}
 
-sub main () { #{{{
+sub main () {
 	getconfig();
 	
 	if ($config{setup}) {
-		require IkiWiki::Setup;
-		IkiWiki::Setup::load($config{setup});
-		
+		delete $config{setup};
 		loadplugins();
 		checkconfig();
 
@@ -126,17 +139,16 @@ sub main () { #{{{
 			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 => undef,
-					%{$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}) {
+				if (! $config{cgi} && ! $config{post_commit} &&
+				    ! $config{test_receive}) {
 					$config{post_commit}=1;
 				}
 				gen_wrapper();
@@ -145,16 +157,15 @@ sub main () { #{{{
 		}
 		
 		# setup implies a wiki rebuild by default
-		if (! $config{refresh}) {
+		if (! $config{refresh} && ! $config{render}) {
 			$config{rebuild}=1;
 		}
-		
-		# ignore syslog setting from setup file
-		# while doing initial setup
-		$config{syslog}=0 unless $config{dumpsetup};
 	}
 
 	if ($config{dumpsetup}) {
+		$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});
 	}
@@ -177,8 +188,12 @@ sub main () { #{{{
 	elsif ($config{post_commit} && ! commit_hook_enabled()) {
 		# do nothing
 	}
+	elsif ($config{test_receive}) {
+		require IkiWiki::Receive;
+		IkiWiki::Receive::test();
+	}
 	else {
-		if (! $config{refresh}) {
+		if ($config{rebuild}) {
 			debug(gettext("rebuilding wiki.."));
 		}
 		else {
@@ -192,6 +207,6 @@ sub main () { #{{{
 		saveindex();
 		debug(gettext("done"));
 	}
-} #}}}
+}
 
 main;