X-Git-Url: https://scripts.mit.edu/gitweb/www/ikiwiki.git/blobdiff_plain/58318b3ef9f827425d0e1d44676f1b6b016cb413..255172215e8d886ae875e79694bda1a656053410:/ikiwiki.in

diff --git a/ikiwiki.in b/ikiwiki.in
index 2aeaf94ec..8066bbc6e 100755
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -20,6 +20,7 @@ sub getconfig () { #{{{
 		Getopt::Long::Configure('pass_through');
 		GetOptions(
 			"setup|s=s" => \$config{setup},
+			"dumpsetup|s=s" => \$config{dumpsetup},
 			"wikiname=s" => \$config{wikiname},
 			"verbose|v!" => \$config{verbose},
 			"syslog!" => \$config{syslog},
@@ -29,6 +30,7 @@ sub getconfig () { #{{{
 			"render=s" => \$config{render},
 			"wrappers!" => \$config{wrappers},
 			"usedirs!" => \$config{usedirs},
+			"prefix-directives!" => \$config{prefix_directives},
 			"getctime" => \$config{getctime},
 			"numbacklinks=i" => \$config{numbacklinks},
 			"rcs=s" => \$config{rcs},
@@ -36,12 +38,10 @@ sub getconfig () { #{{{
 			"cgi!" => \$config{cgi},
 			"discussion!" => \$config{discussion},
 			"w3mmode!" => \$config{w3mmode},
-			"notify!" => \$config{notify},
 			"url=s" => \$config{url},
 			"cgiurl=s" => \$config{cgiurl},
 			"historyurl=s" => \$config{historyurl},
 			"diffurl=s" => \$config{diffurl},
-			"svnrepo" => \$config{svnrepo},
 			"svnpath" => \$config{svnpath},
 			"adminemail=s" => \$config{adminemail},
 			"timeformat=s" => \$config{timeformat},
@@ -74,9 +74,6 @@ sub getconfig () { #{{{
 			"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) {
@@ -115,7 +112,45 @@ sub main () { #{{{
 	
 	if ($config{setup}) {
 		require IkiWiki::Setup;
-		setup();
+		IkiWiki::Setup::load($config{setup});
+		if (! $config{render} && ! $config{dumpsetup} &&
+		    (! $config{refresh} || $config{wrappers})) {
+			debug(gettext("generating wrappers.."));
+			require IkiWiki::Wrapper;
+			my %origconfig=(%config);
+			my @wrappers=@{$config{wrappers}};
+			delete $config{wrappers};
+			foreach my $wrapper (@wrappers) {
+				%config=(%origconfig,
+					rebuild => 0,
+					verbose => 0,
+					%{$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;
+		}
+		
+		# ignore syslog setting from setup file
+		# while doing initial setup
+		$config{syslog}=0;	
+		
+		loadplugins();
+		checkconfig();
+	}
+
+	if ($config{dumpsetup}) {
+		require IkiWiki::Setup::Standard;
+		IkiWiki::Setup::Standard::dump($config{dumpsetup});
 	}
 	elsif ($config{wrapper}) {
 		lockwiki();
@@ -123,28 +158,33 @@ sub main () { #{{{
 		gen_wrapper();
 	}
 	elsif ($config{cgi}) {
-		loadindex();
 		require IkiWiki::CGI;
-		cgi();
+		eval {cgi()};
+		if ($@) {
+			cgierror($@);
+		}
 	}
 	elsif ($config{render}) {
 		require IkiWiki::Render;
 		commandline_render();
 	}
 	elsif ($config{post_commit} && ! commit_hook_enabled()) {
-		if ($config{notify}) {
-			loadindex();
-			rcs_notify();
-		}
+		# do nothing
 	}
 	else {
+		if (! $config{refresh}) {
+			debug(gettext("rebuilding wiki.."));
+		}
+		else {
+			debug(gettext("refreshing wiki.."));
+		}
 		lockwiki();
 		loadindex();
 		require IkiWiki::Render;
 		rcs_update();
 		refresh();
-		rcs_notify() if $config{notify};
 		saveindex();
+		debug(gettext("done"));
 	}
 } #}}}