From f7f45d6a0ad41f3cd077b0310ce83f199b658b4d Mon Sep 17 00:00:00 2001
From: joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Date: Mon, 13 Mar 2006 19:10:29 +0000
Subject: add rebuild after calling setup, better format for setup files

---
 ikiwiki | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'ikiwiki')

diff --git a/ikiwiki b/ikiwiki
index 111ef54fc..ea3833a37 100755
--- a/ikiwiki
+++ b/ikiwiki
@@ -1152,6 +1152,7 @@ sub cgi () { #{{{
 
 sub setup () { # {{{
 	my $setup=possibly_foolish_untaint($config{setup});
+	delete $config{setup};
 	open (IN, $setup) || error("read $setup: $!\n");
 	local $/=undef;
 	my $code=<IN>;
@@ -1159,7 +1160,15 @@ sub setup () { # {{{
 	close IN;
 	eval $code;
 	error($@) if $@;
-	print "ikiwiki setup complete\n";
+	print "$config{wikiname} setup complete, now forcing a rebuild.\n";
+	$config{cgi}=0;
+	$config{rebuild}=1;
+	foreach my $c (keys %config) {
+		$config{$c}=possibly_foolish_untaint($config{$c})
+			if defined $config{$c};
+	}
+	refresh();
+	saveindex();
 	exit;
 } #}}}
 
-- 
cgit v1.2.3