require srcdir and destdir params when --render used w/o --setup
authorJoey Hess <joey@kodama.kitenet.net>
Thu, 30 Oct 2008 19:05:58 +0000 (15:05 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Thu, 30 Oct 2008 19:05:58 +0000 (15:05 -0400)
The srcdir is needed by --render, so if --setup is not specified, read it
at the command line.

ikiwiki.in

index d2f5d48dcc85889090f87b22c5684b81844f6d28..1a6d18a6089b8e98cb83433e1c5ada1a6f26c917 100755 (executable)
@@ -98,7 +98,7 @@ sub getconfig () { #{{{
                        "help|h" => sub { $SIG{__WARN__}=sub {}; die },
                ) || usage();
 
                        "help|h" => sub { $SIG{__WARN__}=sub {}; die },
                ) || usage();
 
-               if (! $config{setup} && ! $config{render}) {
+               if (! $config{setup}) {
                        loadplugins();
                        if (@ARGV == 2) {
                                $config{srcdir} = possibly_foolish_untaint(shift @ARGV);
                        loadplugins();
                        if (@ARGV == 2) {
                                $config{srcdir} = possibly_foolish_untaint(shift @ARGV);