* Remove CDPATH and other env vars perl taint checking doesn't like.

[git.ikiwiki.info.git] / ikiwiki

diff --git a/ikiwiki b/ikiwiki
index 6518b8626a943c24fa2947946c98b116d056d167..1342ec543f3e54c216e16cb615e9493c67484e8a 100755 (executable)
--- a/ikiwiki
+++ b/ikiwiki
@@ -1,5 +1,6 @@
 #!/usr/bin/perl -T
 $ENV{PATH}="/usr/local/bin:/usr/bin:/bin";
+delete @ENV{qw{IFS CDPATH ENV BASH_ENV}};
 
 package IkiWiki;
 use warnings;
@@ -69,12 +70,6 @@ sub getconfig () { #{{{
 
                if (! $config{setup}) {
                        loadplugins();
-                       run_hooks(getopt => sub { shift->() });
-                       if (grep /^-/, @ARGV) {
-                               print STDERR "Unknown option: $_\n"
-                                       foreach grep /^-/, @ARGV;
-                               usage();
-                       }
                        usage() unless @ARGV == 2;
                        $config{srcdir} = possibly_foolish_untaint(shift @ARGV);
                        $config{destdir} = possibly_foolish_untaint(shift @ARGV);