oops

[ikiwiki.git] / ikiwiki

diff --git a/ikiwiki b/ikiwiki
index 1ac0ce9c0a0cf5880b9713236610cccef829d10e..936b0a1733cbf7decac4ac22066f3aa02e0069e8 100755 (executable)
--- a/ikiwiki
+++ b/ikiwiki
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -T
-
 $ENV{PATH}="/usr/local/bin:/usr/bin:/bin";
 
 package IkiWiki;
@@ -11,6 +10,10 @@ use lib '.'; # For use without installation, removed by Makefile.
 
 use vars qw{%config %links %oldlinks %oldpagemtime %renderedfiles %pagesources};
 
+sub usage () { #{{{
+       die "usage: ikiwiki [options] source dest\n";
+} #}}}
+
 sub getconfig () { #{{{
        if (! exists $ENV{WRAPPED_OPTIONS}) {
                %config=(
@@ -67,8 +70,8 @@ sub getconfig () { #{{{
 
                if (! $config{setup}) {
                        usage() unless @ARGV == 2;
-                       $config{srcdir} = possibly_foolish_untaint(shift);
-                       $config{destdir} = possibly_foolish_untaint(shift);
+                       $config{srcdir} = possibly_foolish_untaint(shift @ARGV);
+                       $config{destdir} = possibly_foolish_untaint(shift @ARGV);
                        checkconfig();
                }
        }
@@ -106,10 +109,6 @@ sub error ($) { #{{{
        die @_;
 } #}}}
 
-sub usage () { #{{{
-       die "usage: ikiwiki [options] source dest\n";
-} #}}}
-
 sub possibly_foolish_untaint ($) { #{{{
        my $tainted=shift;
        my ($untainted)=$tainted=~/(.*)/;