urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

allow --dumpsetup to be used w/o specifying srcdir and destdir 

shortcut tried to use srcdir in checkconfig; change it to not so this will
work.
master
Joey Hess 2008-07-26 23:00:44 -04:00
parent 4f06e7402a
commit 6a64d13352
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
IkiWiki/Plugin/shortcut.pm
View File

@ -6,11 +6,11 @@ use strict;
use IkiWiki 2.00; use IkiWiki 2.00;
sub import { #{{{ sub import { #{{{
hook(type => "checkconfig", id => "shortcut", call => \&checkconfig); hook(type => "refresh", id => "shortcut", call => \&refresh);
hook(type => "preprocess", id => "shortcut", call => \&preprocess_shortcut); hook(type => "preprocess", id => "shortcut", call => \&preprocess_shortcut);
} #}}} } #}}}
sub checkconfig () { #{{{ sub refresh () { #{{{
# Preprocess the shortcuts page to get all the available shortcuts # Preprocess the shortcuts page to get all the available shortcuts
# defined before other pages are rendered. # defined before other pages are rendered.
my $srcfile=srcfile("shortcuts.mdwn", 1); my $srcfile=srcfile("shortcuts.mdwn", 1);

6
ikiwiki.in
View File

@ -88,11 +88,15 @@ sub getconfig () { #{{{
if (! $config{setup} && ! $config{render}) { if (! $config{setup} && ! $config{render}) {
loadplugins(); loadplugins();
usage() unless @ARGV == 2; if (@ARGV == 2) {
$config{srcdir} = possibly_foolish_untaint(shift @ARGV); $config{srcdir} = possibly_foolish_untaint(shift @ARGV);
$config{destdir} = possibly_foolish_untaint(shift @ARGV); $config{destdir} = possibly_foolish_untaint(shift @ARGV);
checkconfig(); checkconfig();
} }
else {
usage() unless $config{dumpsetup};
}
}
} }
else { else {
# wrapper passes a full config structure in the environment # wrapper passes a full config structure in the environment