X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/5bea644fdd9216ace2015d1e9ca85cde21689180..cab1ac75c91d8c351c41920a02e79484a34428e2:/IkiWiki/Setup/Standard.pm

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index dcb278bf4..54819ae75 100644
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -7,16 +7,16 @@ package IkiWiki::Setup::Standard;
 
 use warnings;
 use strict;
+use IkiWiki;
 
 sub import { #{{{
 	$IkiWiki::Setup::raw_setup=$_[1];
 } #}}}
 
-package IkiWiki::Setup;
-
-sub dumpline ($$$) { #{{{
+sub dumpline ($$$$) { #{{{
 	my $key=shift;
 	my $value=shift;
+	my $type=shift;
 	my $prefix=shift;
 	
 	eval q{use Data::Dumper};
@@ -27,11 +27,23 @@ sub dumpline ($$$) { #{{{
 	local $Data::Dumper::Sortkeys=1;
 	local $Data::Dumper::Quotekeys=0;
 	
-	my $dumpedvalue=Dumper($value);
-	chomp $dumpedvalue;
-	$dumpedvalue=~s/^\t//;
+	my $dumpedvalue;
+	if ($type eq 'boolean' || $type eq 'integer') {
+		# avoid quotes
+		$dumpedvalue=$value;
+	}
+	elsif ($type eq 'string' && ref $value eq 'ARRAY' && @$value &&
+	    ! grep { /[^-A-Za-z0-9_]/ } @$value) {
+		# dump simple array as qw{}
+		$dumpedvalue="[qw{ ".join(" ", @$value)." }]";
+	}
+	else {
+		$dumpedvalue=Dumper($value);
+		chomp $dumpedvalue;
+		$dumpedvalue=~s/^\t//;
+	}
 	
-	return "\t$prefix$key=$dumpedvalue,";
+	return "\t$prefix$key => $dumpedvalue,";
 } #}}}
 
 sub dumpvalues ($@) { #{{{
@@ -40,28 +52,33 @@ sub dumpvalues ($@) { #{{{
 	while (@_) {
 		my $key=shift;
 		my %info=%{shift()};
+
+		next if $info{type} eq "internal";
 		
 		push @ret, "\t# ".$info{description} if exists $info{description};
 		
 		if (exists $setup->{$key} && defined $setup->{$key}) {
-			push @ret, dumpline($key, $setup->{$key}, "");
+			push @ret, dumpline($key, $setup->{$key}, $info{type}, "");
 			delete $setup->{$key};
 		}
-		elsif (exists $info{default}) {
-			push @ret, dumpline($key, $info{default}, "#");
+		elsif (exists $info{default} && defined $info{default}) {
+			push @ret, dumpline($key, $info{default}, $info{type}, "#");
 		}
 		elsif (exists $info{example}) {
-			push @ret, dumpline($key, $info{example}, "#");
+			push @ret, dumpline($key, $info{example}, $info{type}, "#");
 		}
 	}
 	return @ret;
 } #}}}
 
-sub dump ($) { #{{{
-	my $file=shift;
-	
+sub gendump ($) { #{{{
+	my $description=shift;
 	my %setup=(%config);
 	my @ret;
+	
+	push @ret, "\t# basic setup";
+	push @ret, dumpvalues(\%setup, IkiWiki::getsetup());
+	push @ret, "";
 
 	foreach my $id (sort keys %{$IkiWiki::hooks{getsetup}}) {
 		# use an array rather than a hash, to preserve order
@@ -72,26 +89,18 @@ sub dump ($) { #{{{
 		push @ret, "";
 	}
 	
-	if (%setup) {
-		push @ret, "\t# other";
-		foreach my $key (sort keys %setup) {
-			push @ret, dumpline($key, $setup{$key}, "");
-		}
-	}
-	
-	unshift @ret, "#!/usr/bin/perl
-# 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.
-
-use IkiWiki::Setup::Standard {";
+	unshift @ret,
+		"#!/usr/bin/perl",
+		"# $description",
+		"#",
+		"# 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.",
+		"use IkiWiki::Setup::Standard {";
 	push @ret, "}";
 
-	open (OUT, ">", $file) || die "$file: $!";
-	print OUT "$_\n" foreach @ret;
-	close OUT;
+	return @ret;
 } #}}}
 
 1