X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/58318b3ef9f827425d0e1d44676f1b6b016cb413..e4b096ac411494416d73e344e0aaeaacabf2f266:/ikiwiki.in?ds=inline

diff --git a/ikiwiki.in b/ikiwiki.in
index 2aeaf94ec..3bb881c43 100755
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -29,6 +29,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 +37,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},
@@ -123,19 +122,18 @@ 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 {
 		lockwiki();
@@ -143,7 +141,6 @@ sub main () { #{{{
 		require IkiWiki::Render;
 		rcs_update();
 		refresh();
-		rcs_notify() if $config{notify};
 		saveindex();
 	}
 } #}}}