aboutsummaryrefslogtreecommitdiff
path: root/ikiwiki.in
diff options
context:
space:
mode:
Diffstat (limited to 'ikiwiki.in')
-rwxr-xr-xikiwiki.in38
1 files changed, 26 insertions, 12 deletions
diff --git a/ikiwiki.in b/ikiwiki.in
index ac43044df..aa3337938 100755
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -14,24 +14,32 @@ sub usage () {
gettext(" ikiwiki --setup configfile"), "\n";
}
+sub setup (@) {
+ require IkiWiki::Setup;
+ my $verbose=$config{verbose};
+ my $syslog=$config{syslog};
+ IkiWiki::Setup::load($_[1]);
+ $config{setupverbose}=$config{verbose};
+ $config{setupsyslog}=$config{syslog};
+ $config{verbose}=$verbose || $config{setupverbose};
+ $config{syslog}=$syslog;
+ $config{setup}=1;
+}
+
sub getconfig () {
if (! exists $ENV{WRAPPED_OPTIONS}) {
%config=defaultconfig();
eval q{use Getopt::Long};
Getopt::Long::Configure('pass_through');
GetOptions(
- "setup|s=s" => sub {
- require IkiWiki::Setup;
- my $verbose=$config{verbose};
- my $syslog=$config{syslog};
- IkiWiki::Setup::load($_[1]);
- $config{setupverbose}=$config{verbose};
- $config{setupsyslog}=$config{syslog};
- $config{verbose}=$verbose || $config{setupverbose};
- $config{syslog}=$syslog;
- $config{setup}=1;
- },
+ "setup|s=s" => \&setup,
"dumpsetup|s=s" => \$config{dumpsetup},
+ "changesetup|s=s" => sub {
+ $config{changesetup}=$_[1];
+ $config{genwrappers}=1;
+ $config{refresh}=1;
+ setup(@_);
+ },
"wikiname=s" => \$config{wikiname},
"verbose|v!" => \$config{verbose},
"syslog!" => \$config{syslog},
@@ -85,7 +93,8 @@ sub getconfig () {
$config{wrappermode}=possibly_foolish_untaint($_[1])
},
"plugin=s@" => sub {
- push @{$config{add_plugins}}, $_[1];
+ push @{$config{add_plugins}}, $_[1]
+ unless grep { $_ eq $_[1] } @{$config{add_plugins}};
},
"disable-plugin=s@" => sub {
push @{$config{disable_plugins}}, $_[1];
@@ -181,6 +190,11 @@ sub main () {
}
}
+ if ($config{changesetup}) {
+ require IkiWiki::Setup;
+ IkiWiki::Setup::dump($config{changesetup});
+ }
+
if ($config{dumpsetup}) {
$config{srcdir}="" if ! defined $config{srcdir};
$config{destdir}="" if ! defined $config{destdir};