X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/c51b304d90104b4be7d3150821f44273d5be4376..62962a470d48dd14ebcd39f1de37504abd2f77b5:/ikiwiki.in

diff --git a/ikiwiki.in b/ikiwiki.in
index 5c2d710b9..22addb463 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 () { #{{{
@@ -26,7 +27,7 @@ sub getconfig () { #{{{
 				IkiWiki::Setup::load($_[1]);
 				$config{setupverbose}=$config{verbose};
 				$config{setupsyslog}=$config{syslog};
-				$config{verbose}=$verbose;
+				$config{verbose}=$verbose || $config{setupverbose};
 				$config{syslog}=$syslog;
 				$config{setup}=1;
 			},
@@ -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};
+
+		# optimisation for no-op post_commit 
+		if ($config{post_commit} && ! commit_hook_enabled()) {
+			exit 0;
+		}
+
 		loadplugins();
 		checkconfig();
 	}
@@ -181,8 +189,11 @@ sub main () { #{{{
 	elsif ($config{post_commit} && ! commit_hook_enabled()) {
 		# do nothing
 	}
+	elsif ($config{test_receive}) {
+		rcs_test_receive();
+	}
 	else {
-		if (! $config{refresh}) {
+		if ($config{rebuild}) {
 			debug(gettext("rebuilding wiki.."));
 		}
 		else {