X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/522daa7ea8111482701ce222800096edaf8eb2d2..e96cf38eccd219714140f221090d2e7751fd4ee0:/IkiWiki/Setup.pm

diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm
index 369ff44d0..ee5be95d2 100644
--- a/IkiWiki/Setup.pm
+++ b/IkiWiki/Setup.pm
@@ -28,18 +28,19 @@ sub load ($;$) {
 	}
 	close IN;
 
-	if ($content=~/(use\s+)?(IkiWiki::Setup::\w+)/) {
+	if ($content=~/((?:use|require)\s+)?IkiWiki::Setup::(\w+)/) {
 		$config{setuptype}=$2;
 		if ($1) {
 			error sprintf(gettext("cannot load %s in safe mode"), $file)
 				if $safemode;
+			no warnings;
 			eval IkiWiki::possibly_foolish_untaint($content);
 			error("$file: ".$@) if $@;
 		}
 		else {
-			eval qq{require $config{setuptype}};
+			eval qq{require IkiWiki::Setup::$config{setuptype}};
 			error $@ if $@;
-			$config{setuptype}->loaddump(IkiWiki::possibly_foolish_untaint($content));
+			"IkiWiki::Setup::$config{setuptype}"->loaddump(IkiWiki::possibly_foolish_untaint($content));
 		}
 	}
 	else {
@@ -50,9 +51,16 @@ sub load ($;$) {
 sub dump ($) {
 	my $file=IkiWiki::possibly_foolish_untaint(shift);
 	
-	eval qq{require $config{setuptype}};
+	eval qq{require IkiWiki::Setup::$config{setuptype}};
 	error $@ if $@;
-	my @dump=$config{setuptype}->gendump("Setup file for ikiwiki.");
+	my @dump="IkiWiki::Setup::$config{setuptype}"->gendump(
+		"Setup file for ikiwiki.",
+		"",
+		"Passing this to ikiwiki --setup will make ikiwiki generate",
+		"wrappers and build the wiki.",
+		"",
+		"Remember to re-run ikiwiki --setup any time you edit this file.",
+	);
 
 	open (OUT, ">", $file) || die "$file: $!";
 	print OUT "$_\n" foreach @dump;
@@ -159,8 +167,9 @@ sub getsetup () {
 		} keys %sections;
 }
 
-sub commented_dump ($) {
+sub commented_dump ($$) {
 	my $dumpline=shift;
+	my $indent=shift;
 
 	my %setup=(%config);
 	my @ret;
@@ -172,7 +181,7 @@ sub commented_dump ($) {
 	die $@ if $@;
 
 	my %section_plugins;
-	push @ret, commented_dumpvalues($dumpline, \%setup, IkiWiki::getsetup());
+	push @ret, commented_dumpvalues($dumpline, $indent, \%setup, IkiWiki::getsetup());
 	foreach my $pair (IkiWiki::Setup::getsetup()) {
 		my $plugin=$pair->[0];
 		my $setup=$pair->[1];
@@ -180,25 +189,26 @@ sub commented_dump ($) {
 		my $section=$s{plugin}->{section};
 		push @{$section_plugins{$section}}, $plugin;
 		if (@{$section_plugins{$section}} == 1) {
-			push @ret, "", "\t".("#" x 70), "\t# $section plugins",
+			push @ret, "", $indent.("#" x 70), "$indent# $section plugins",
 				sub {
-					wrap("\t#   (", "\t#    ",
+					wrap("$indent#   (", "$indent#    ",
 						join(", ", @{$section_plugins{$section}})).")"
 				},
-				"\t".("#" x 70);
+				$indent.("#" x 70);
 		}
 
-		my @values=commented_dumpvalues($dumpline, \%setup, @{$setup});
+		my @values=commented_dumpvalues($dumpline, $indent, \%setup, @{$setup});
 		if (@values) {
-			push @ret, "", "\t# $plugin plugin", @values;
+			push @ret, "", "$indent# $plugin plugin", @values;
 		}
 	}
 
 	return map { ref $_ ? $_->() : $_ } @ret;
 }
 
-sub commented_dumpvalues ($$@) {
+sub commented_dumpvalues ($$$@) {
 	my $dumpline=shift;
+	my $indent=shift;
 	my $setup=shift;
 	my @ret;
 	while (@_) {
@@ -207,7 +217,7 @@ sub commented_dumpvalues ($$@) {
 
 		next if $key eq "plugin" || $info{type} eq "internal";
 		
-		push @ret, "\t# ".$info{description} if exists $info{description};
+		push @ret, "$indent# ".$info{description} if exists $info{description};
 		
 		if (exists $setup->{$key} && defined $setup->{$key}) {
 			push @ret, $dumpline->($key, $setup->{$key}, $info{type}, "");