summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-07-26 15:39:41 -0400
committerJoey Hess <joey@kodama.kitenet.net>2008-07-26 15:39:41 -0400
commitb073359b18be7940d5138037a6423b8c45bfa39f (patch)
tree82f40840f1c90fcbc7ca3b4b380e356cfc41ab18
parent1c00717cb2737bde3870b2fe504f40bb7d215477 (diff)
refactor
-rw-r--r--IkiWiki/Setup.pm10
-rw-r--r--IkiWiki/Setup/Standard.pm8
-rwxr-xr-xikiwiki.in4
3 files changed, 14 insertions, 8 deletions
diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm
index 9c45a8baf..adb8abb62 100644
--- a/IkiWiki/Setup.pm
+++ b/IkiWiki/Setup.pm
@@ -62,4 +62,14 @@ sub load ($) { # {{{
}
} #}}}
+sub dump ($) { #{{{
+ my $file=IkiWiki::possibly_foolish_untaint(shift);
+
+ require IkiWiki::Setup::Standard;
+
+ open (OUT, ">", $file) || die "$file: $!";
+ print OUT "$_\n" foreach IkiWiki::Setup::Standard::gendump();
+ close OUT;
+}
+
1
diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index ed4331d61..22bfc38a4 100644
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -71,9 +71,7 @@ sub dumpvalues ($@) { #{{{
return @ret;
} #}}}
-sub dump ($) { #{{{
- my $file=IkiWiki::possibly_foolish_untaint(shift);
-
+sub gendump () { #{{{
my %setup=(%config);
my @ret;
@@ -100,9 +98,7 @@ sub dump ($) { #{{{
use IkiWiki::Setup::Standard {";
push @ret, "}";
- open (OUT, ">", $file) || die "$file: $!";
- print OUT "$_\n" foreach @ret;
- close OUT;
+ return @ret;
} #}}}
1
diff --git a/ikiwiki.in b/ikiwiki.in
index 8cb8a4769..febc8ff56 100755
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -150,8 +150,8 @@ sub main () { #{{{
}
if ($config{dumpsetup}) {
- require IkiWiki::Setup::Standard;
- IkiWiki::Setup::Standard::dump($config{dumpsetup});
+ require IkiWiki::Setup;
+ IkiWiki::Setup::dump($config{dumpsetup});
}
elsif ($config{wrapper}) {
lockwiki();