From e4d9da55d923cdd78cd07959de44edf17a9a5fe5 Mon Sep 17 00:00:00 2001
From: joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Date: Thu, 23 Mar 2006 04:01:02 +0000
Subject: At Branden's request, clean up the hardcoded ".ikiwiki" everywhere,
 and add checkoptions() that can be used to set defaults for this and other
 options based on existing options.

Also involved some cleanups to how gen_wrapper is used.
---
 IkiWiki/Setup/Standard.pm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'IkiWiki/Setup')

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index 68f43b408..76213b11a 100644
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -14,7 +14,9 @@ sub import {
 
 	::debug("generating wrappers..");
 	foreach my $wrapper (@{$setup{wrappers}}) {
-		::gen_wrapper(%::config, verbose => 0, %setup, %{$wrapper});
+		%::config=(%::config, verbose => 0, %setup, %{$wrapper});
+		::checkoptions();
+		::gen_wrapper();
 	}
 
 	::debug("rebuilding wiki..");
@@ -23,6 +25,7 @@ sub import {
 			if defined $setup{$c} && ! ref $setup{$c};
 	}
 	$::config{rebuild}=1;
+	::checkoptions();
 	::refresh();
 
 	::debug("done");
-- 
cgit v1.2.3