diff options
| author | Joey Hess <joey@kodama.kitenet.net> | 2008-08-06 01:58:04 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kodama.kitenet.net> | 2008-08-06 01:58:04 -0400 |
| commit | adc2eb3d8c900a011000431b01ff4b89d5f4f689 (patch) | |
| tree | 1a1888f6fd43a7065a9a15abcdf15d7cddaef3db /IkiWiki.pm | |
| parent | 6fb6d515247b53641c18c286312eb26b58bb9df3 (diff) | |
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.
Diffstat (limited to 'IkiWiki.pm')
| -rw-r--r-- | IkiWiki.pm | 11 |
1 files changed, 9 insertions, 2 deletions
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, }, |