projects
/
ikiwiki.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
shorten setuptype
[ikiwiki.git]
/
IkiWiki
/
Setup.pm
diff --git
a/IkiWiki/Setup.pm
b/IkiWiki/Setup.pm
index a71a12d9d28ae53c5f4e9f2abe74a77c81b33232..2cf01ea684e634da1b8bb4e0254256ca3507e59c 100644
(file)
--- a/
IkiWiki/Setup.pm
+++ b/
IkiWiki/Setup.pm
@@
-28,7
+28,7
@@
sub load ($;$) {
}
close IN;
}
close IN;
- if ($content=~/(use\s+)?
(IkiWiki::Setup::
\w+)/) {
+ if ($content=~/(use\s+)?
IkiWiki::Setup::(
\w+)/) {
$config{setuptype}=$2;
if ($1) {
error sprintf(gettext("cannot load %s in safe mode"), $file)
$config{setuptype}=$2;
if ($1) {
error sprintf(gettext("cannot load %s in safe mode"), $file)
@@
-37,9
+37,9
@@
sub load ($;$) {
error("$file: ".$@) if $@;
}
else {
error("$file: ".$@) if $@;
}
else {
- eval qq{require $config{setuptype}};
+ eval qq{require
IkiWiki::Setup::
$config{setuptype}};
error $@ if $@;
error $@ if $@;
-
$config{setuptype}
->loaddump(IkiWiki::possibly_foolish_untaint($content));
+
"IkiWiki::Setup::$config{setuptype}"
->loaddump(IkiWiki::possibly_foolish_untaint($content));
}
}
else {
}
}
else {
@@
-50,9
+50,9
@@
sub load ($;$) {
sub dump ($) {
my $file=IkiWiki::possibly_foolish_untaint(shift);
sub dump ($) {
my $file=IkiWiki::possibly_foolish_untaint(shift);
- eval qq{require $config{setuptype}};
+ eval qq{require
IkiWiki::Setup::
$config{setuptype}};
error $@ if $@;
error $@ if $@;
- my @dump=
$config{setuptype}
->gendump(
+ my @dump=
"IkiWiki::Setup::$config{setuptype}"
->gendump(
"Setup file for ikiwiki.",
"",
"Passing this to ikiwiki --setup will make ikiwiki generate",
"Setup file for ikiwiki.",
"",
"Passing this to ikiwiki --setup will make ikiwiki generate",