X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/1612dce6bbb050eacf6843b972ffaf9816d724be..c8330da6c050918eaea4a441ba2ed59258f49494:/ikiwiki.in

diff --git a/ikiwiki.in b/ikiwiki.in
index 8cec3f5c0..4f24cfc2e 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 () { #{{{
@@ -19,7 +20,18 @@ 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;
+				my $verbose=$config{verbose};
+				my $syslog=$config{syslog};
+				IkiWiki::Setup::load($_[1]);
+				$config{setupverbose}=$config{verbose};
+				$config{setupsyslog}=$config{syslog};
+				$config{verbose}=$verbose || $config{setupverbose};
+				$config{syslog}=$syslog;
+				$config{setup}=1;
+			},
+			"dumpsetup|s=s" => \$config{dumpsetup},
 			"wikiname=s" => \$config{wikiname},
 			"verbose|v!" => \$config{verbose},
 			"syslog!" => \$config{syslog},
@@ -27,29 +39,27 @@ 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},
-			"wrappermode=i" => \$config{wrappermode},
 			"numbacklinks=i" => \$config{numbacklinks},
 			"rcs=s" => \$config{rcs},
 			"no-rcs" => sub { $config{rcs}="" },
 			"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},
 			"sslcookie!" => \$config{sslcookie},
-			"httpauth!" => \$config{httpauth},
 			"userdir=s" => \$config{userdir},
 			"htmlext=s" => \$config{htmlext},
+			"libdir=s" => \$config{libdir},
 			"exclude=s@" => sub {
 				push @{$config{wiki_file_prune_regexps}}, $_[1];
 			},
@@ -63,29 +73,41 @@ sub getconfig () { #{{{
 				$config{underlaydir}=possibly_foolish_untaint($_[1])
 			},
 			"wrapper:s" => sub {
-				$config{wrapper}=$_[1] ? $_[1] : "ikiwiki-wrap"
+				$config{wrapper}=$_[1] ? possibly_foolish_untaint($_[1]) : "ikiwiki-wrap"
+			},
+			"wrappermode=i" => sub {
+				$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) {
+					die gettext("usage: --set var=value"), "\n";
+				}
+				$config{$var}=$val;
 			},
 			"version" => sub {
 				print "ikiwiki version $IkiWiki::version\n";
 				exit;
 			},
+			"help|h" => sub { $SIG{__WARN__}=sub {}; die },
 		) || usage();
 
 		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 {
@@ -95,6 +117,7 @@ sub getconfig () { #{{{
 		if ($@) {
 			error("WRAPPED_OPTIONS: $@");
 		}
+		delete $ENV{WRAPPED_OPTIONS};
 		loadplugins();
 		checkconfig();
 	}
@@ -103,38 +126,77 @@ sub getconfig () { #{{{
 sub main () { #{{{
 	getconfig();
 	
-	if ($config{cgi}) {
-		loadindex();
-		require IkiWiki::CGI;
-		cgi();
+	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);
+			foreach my $wrapper (@{$config{wrappers}}) {
+				%config=(%origconfig, %{$wrapper});
+				$config{verbose}=$config{setupverbose}
+					if exists $config{setupverbose};
+				$config{syslog}=$config{setupsyslog}
+					if exists $config{setupsyslog};
+				delete @config{qw(setupsyslog setupverbose wrappers genwrappers rebuild)};
+				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;
+		}
 	}
-	elsif ($config{setup}) {
+
+	if ($config{dumpsetup}) {
+		$config{srdir}=$config{destdir}="";
 		require IkiWiki::Setup;
-		setup();
+		IkiWiki::Setup::dump($config{dumpsetup});
 	}
 	elsif ($config{wrapper}) {
 		lockwiki();
 		require IkiWiki::Wrapper;
 		gen_wrapper();
 	}
+	elsif ($config{cgi}) {
+		require IkiWiki::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{rebuild}) {
+			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"));
 	}
 } #}}}