X-Git-Url: https://scripts.mit.edu/gitweb/www/ikiwiki.git/blobdiff_plain/c4777e30a94c07b915aa192ec9b24d039ebe76d9..7ddea03684df47c861c264216b83e7653d6784fd:/ikiwiki.in

diff --git a/ikiwiki.in b/ikiwiki.in
index cb9e3c347..f2407b8d0 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 () { #{{{
@@ -94,6 +95,7 @@ sub getconfig () { #{{{
 				print "ikiwiki version $IkiWiki::version\n";
 				exit;
 			},
+			"help|h" => sub { $SIG{__WARN__}=sub {}; die },
 		) || usage();
 
 		if (! $config{setup} && ! $config{render}) {
@@ -116,6 +118,12 @@ sub getconfig () { #{{{
 			error("WRAPPED_OPTIONS: $@");
 		}
 		delete $ENV{WRAPPED_OPTIONS};
+
+		if ($config{post_commit} && ! commit_hook_enabled()) {
+			# optimisation for no-op post_commit 
+			exit 0;
+		}
+
 		loadplugins();
 		checkconfig();
 	}
@@ -143,7 +151,8 @@ sub main () { #{{{
 					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();
@@ -181,8 +190,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 {