added a git mirror, and some reorg

[ikiwiki.git] / IkiWiki / Setup.pm

diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm
index 63659ce2e03e7147be14063bf13e24278ddab94f..560bc798bf4cd03da85e16eeb97aeed4d72125a5 100644 (file)
--- a/IkiWiki/Setup.pm
+++ b/IkiWiki/Setup.pm
@@ -2,20 +2,26 @@
 
 use warnings;
 use strict;
+use IkiWiki;
+use open qw{:utf8 :std};
 
 package IkiWiki;
 
 sub setup () { # {{{
        my $setup=possibly_foolish_untaint($config{setup});
        delete $config{setup};
-       open (IN, $setup) || error("read $setup: $!\n");
-       local $/=undef;
-       my $code=<IN>;
+       open (IN, $setup) || error(sprintf(gettext("cannot read %s: %s"), $setup, $!));
+       my $code;
+       {
+               local $/=undef;
+               $code=<IN>;
+       }
        ($code)=$code=~/(.*)/s;
        close IN;
 
        eval $code;
        error($@) if $@;
+
        exit;
 } #}}}