From adc2eb3d8c900a011000431b01ff4b89d5f4f689 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Wed, 6 Aug 2008 01:58:04 -0400
Subject: Options set in the setup file are now immediatly loaded by ikiwiki
 -setup. This allows later switches to override them. Previously, setup file
 options overrode most command line options.

---
 IkiWiki.pm | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'IkiWiki.pm')

diff --git a/IkiWiki.pm b/IkiWiki.pm
index e1c4b6e2f..e4765219e 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -354,6 +354,13 @@ sub getsetup () { #{{{
 		safe => 0,
 		rebuild => 0,
 	},
+	setup => {
+		type => "internal",
+		default => undef,
+		description => "running in setup mode",
+		safe => 0,
+		rebuild => 0,
+	},
 	refresh => {
 		type => "internal",
 		default => 0,
@@ -375,10 +382,10 @@ sub getsetup () { #{{{
 		safe => 0,
 		rebuild => 0,
 	},
-	setup => {
+	setupfile => {
 		type => "internal",
 		default => undef,
-		description => "setup file to read",
+		description => "path to setup file",
 		safe => 0,
 		rebuild => 0,
 	},
-- 
cgit v1.2.3