X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/c588845a051da89505db9e55158783e1650ff0e2..ee9381a24483d74aa6bd66d3b69145ba081250fb:/ikiwiki.in?ds=sidebyside

diff --git a/ikiwiki.in b/ikiwiki.in
index 3bb881c43..e0a657cda 100755
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -19,7 +19,12 @@ 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;
+				IkiWiki::Setup::load($_[1]);
+				$config{setup}=1;
+			},
+			"dumpsetup|s=s" => \$config{dumpsetup},
 			"wikiname=s" => \$config{wikiname},
 			"verbose|v!" => \$config{verbose},
 			"syslog!" => \$config{syslog},
@@ -27,7 +32,7 @@ sub getconfig () { #{{{
 			"refresh!" => \$config{refresh},
 			"post-commit" => \$config{post_commit},
 			"render=s" => \$config{render},
-			"wrappers!" => \$config{wrappers},
+			"wrappers!" => \$config{genwrappers},
 			"usedirs!" => \$config{usedirs},
 			"prefix-directives!" => \$config{prefix_directives},
 			"getctime" => \$config{getctime},
@@ -45,7 +50,6 @@ sub getconfig () { #{{{
 			"adminemail=s" => \$config{adminemail},
 			"timeformat=s" => \$config{timeformat},
 			"sslcookie!" => \$config{sslcookie},
-			"httpauth!" => \$config{httpauth},
 			"userdir=s" => \$config{userdir},
 			"htmlext=s" => \$config{htmlext},
 			"libdir=s" => \$config{libdir},
@@ -68,14 +72,11 @@ sub getconfig () { #{{{
 				$config{wrappermode}=possibly_foolish_untaint($_[1])
 			},
 			"plugin=s@" => sub {
-				push @{$config{plugin}}, $_[1];
+				push @{$config{add_plugins}}, $_[1];
 			},
 			"disable-plugin=s@" => sub {
 				push @{$config{disable_plugins}}, $_[1];
 			},
-			"pingurl=s" => sub {
-				push @{$config{pingurl}}, $_[1];
-			},
 			"set=s" => sub {
 				my ($var, $val)=split('=', $_[1], 2);
 				if (! defined $var || ! defined $val) {
@@ -91,10 +92,14 @@ sub getconfig () { #{{{
 
 		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 {
@@ -104,6 +109,7 @@ sub getconfig () { #{{{
 		if ($@) {
 			error("WRAPPED_OPTIONS: $@");
 		}
+		delete $ENV{WRAPPED_OPTIONS};
 		loadplugins();
 		checkconfig();
 	}
@@ -113,8 +119,43 @@ sub main () { #{{{
 	getconfig();
 	
 	if ($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 => undef,
+					%{$wrapper},
+				);
+				checkconfig();
+				if (! $config{cgi} && ! $config{post_commit}) {
+					$config{post_commit}=1;
+				}
+				gen_wrapper();
+			}
+			%config=(%origconfig);
+		}
+		
+		# setup implies a wiki rebuild by default
+		if (! $config{refresh}) {
+			$config{rebuild}=1;
+		}
+	}
+
+	if ($config{dumpsetup}) {
 		require IkiWiki::Setup;
-		setup();
+		IkiWiki::Setup::dump($config{dumpsetup});
 	}
 	elsif ($config{wrapper}) {
 		lockwiki();
@@ -136,12 +177,19 @@ sub main () { #{{{
 		# do nothing
 	}
 	else {
+		if (! $config{refresh}) {
+			debug(gettext("rebuilding wiki.."));
+		}
+		else {
+			debug(gettext("refreshing wiki.."));
+		}
 		lockwiki();
 		loadindex();
 		require IkiWiki::Render;
 		rcs_update();
 		refresh();
 		saveindex();
+		debug(gettext("done"));
 	}
 } #}}}