X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/96ff36b872f65801332c628d23b9f851b058823d..3534d524ab9108fde2a7be1864e6adb8550aa4f1:/ikiwiki.in?ds=inline

diff --git a/ikiwiki.in b/ikiwiki.in
index 344b88148..c79a2bfef 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}) {
@@ -135,7 +135,8 @@ sub main () { #{{{
 
 		if (@{$config{wrappers}} && 
 		    ! $config{render} && ! $config{dumpsetup} &&
-		    (! $config{refresh} || $config{genwrappers})) {
+		    ((! $config{refresh} && ! $config{post_commit})
+		     || $config{genwrappers})) {
 			debug(gettext("generating wrappers.."));
 			require IkiWiki::Wrapper;
 			my %origconfig=(%config);
@@ -157,13 +158,15 @@ sub main () { #{{{
 		}
 		
 		# setup implies a wiki rebuild by default
-		if (! $config{refresh} && ! $config{render}) {
+		if (! $config{refresh} && ! $config{render} &&
+		    ! $config{post_commit}) {
 			$config{rebuild}=1;
 		}
 	}
 
 	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 +209,6 @@ sub main () { #{{{
 		saveindex();
 		debug(gettext("done"));
 	}
-} #}}}
+}
 
 main;