X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/137624775407e433935f68b9ee282723adca1513..f7601954a862afd4c5a5b9ba83480af0472e1cf9:/IkiWiki/Setup.pm?ds=sidebyside

diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm
index 02a462082..8a25ecc57 100644
--- a/IkiWiki/Setup.pm
+++ b/IkiWiki/Setup.pm
@@ -8,30 +8,33 @@ use warnings;
 use strict;
 use IkiWiki;
 use open qw{:utf8 :std};
+use File::Spec;
 
-sub load ($) { # {{{
+sub load ($) {
 	my $setup=IkiWiki::possibly_foolish_untaint(shift);
-	delete $config{setup};
+	$config{setupfile}=File::Spec->rel2abs($setup);
+
 	#translators: The first parameter is a filename, and the second
 	#translators: is a (probably not translated) error message.
 	open (IN, $setup) || error(sprintf(gettext("cannot read %s: %s"), $setup, $!));
 	my $code;
 	{
 		local $/=undef;
-		$code=<IN>;
+		$code=<IN> || error("$setup: $!");
 	}
+	
 	($code)=$code=~/(.*)/s;
 	close IN;
 
 	eval $code;
 	error("$setup: ".$@) if $@;
-} #}}}
+}
 
 sub merge ($) {
 	# Merge setup into existing config and untaint.
 	my %setup=%{shift()};
 
-	if (exists $setup{add_plugins}) {
+	if (exists $setup{add_plugins} && exists $config{add_plugins}) {
 		push @{$setup{add_plugins}}, @{$config{add_plugins}};
 	}
 	if (exists $setup{exclude}) {
@@ -69,16 +72,17 @@ sub merge ($) {
 			wrappermode => (defined $config{cgi_wrappermode} ? $config{cgi_wrappermode} : "06755"),
 		};
 	}
-} #}}}
+}
 
-sub getsetup () { #{{{
-	# Gets all available setup data from all plugins. Returns an ordered list of
-	# [plugin, setup] pairs.
+sub getsetup () {
+	# Gets all available setup data from all plugins. Returns an
+	# ordered list of [plugin, setup] pairs.
 	my @ret;
 
-        # disable logging to syslog while dumping, broken plugins may whine when loaded
+        # disable logging to syslog while dumping, broken plugins may
+	# whine when loaded
 	my $syslog=$config{syslog};
-        $config{syslog}=0;
+        $config{syslog}=undef;
 
 	# Load all plugins, so that all setup options are available.
 	my @plugins=grep { $_ ne $config{rcs} } sort(IkiWiki::listplugins());
@@ -102,9 +106,9 @@ sub getsetup () { #{{{
         $config{syslog}=$syslog;
 
 	return @ret;
-} #}}}
+}
 
-sub dump ($) { #{{{
+sub dump ($) {
 	my $file=IkiWiki::possibly_foolish_untaint(shift);
 	
 	require IkiWiki::Setup::Standard;