fixups

diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm
index c45e59c8e168df673540d2e0177d1513511a3fa8..cb12d9500d95a31545426fd3c984e3297286d457 100644 (file)
--- a/IkiWiki/Plugin/search.pm
+++ b/IkiWiki/Plugin/search.pm
@@ -19,6 +19,7 @@ sub getsetup () { #{{{
        return
                omega_cgi => {
                        type => "string",
        return
                omega_cgi => {
                        type => "string",

+                       example => "/usr/lib/cgi-bin/omega/omega",

                        description => "path to the omega cgi program",
                        safe => 0, # external program
                        rebuild => 0,
                        description => "path to the omega cgi program",
                        safe => 0, # external program
                        rebuild => 0,


@@ -32,7 +33,7 @@ sub checkconfig () { #{{{
                }
        }
        
                }
        }
        

-       if (! exists $config{omega_cgi}) {
+       if (! defined $config{omega_cgi}) {

                $config{omega_cgi}="/usr/lib/cgi-bin/omega/omega";
        }
 } #}}}
                $config{omega_cgi}="/usr/lib/cgi-bin/omega/omega";
        }
 } #}}}

diff --git a/IkiWiki/Plugin/typography.pm b/IkiWiki/Plugin/typography.pm
index 5ba14084b55f26e5f103ff0065ea72d255229189..6229e6c33258b9d6a12a43c8957cb5facbcb3739 100644 (file)
--- a/IkiWiki/Plugin/typography.pm
+++ b/IkiWiki/Plugin/typography.pm
@@ -27,7 +27,6 @@ sub getsetup () { #{{{
                typographyattributes => {
                        type => "string",
                        example => "3",
                typographyattributes => {
                        type => "string",
                        example => "3",

-                       example => "tag",

                        description => "Text::Typography attributes value",
                        safe => 1,
                        rebuild => 1,
                        description => "Text::Typography attributes value",
                        safe => 1,
                        rebuild => 1,

diff --git a/IkiWiki/Rcs/bzr.pm b/IkiWiki/Rcs/bzr.pm
index 136f2d20f1f204367c62e65cb2922874621e4f99..5df522f6ee69b4cd6bdec394fbd495957a8424d2 100644 (file)
--- a/IkiWiki/Rcs/bzr.pm
+++ b/IkiWiki/Rcs/bzr.pm
@@ -12,7 +12,7 @@ hook(type => "checkconfig", id => "bzr", call => sub { #{{{
        if (! defined $config{diffurl}) {
                $config{diffurl}="";
        }
        if (! defined $config{diffurl}) {
                $config{diffurl}="";
        }

-       if (exists $config{bzr_wrapper}) {
+       if (length $config{bzr_wrapper}) {

                push @{$config{wrappers}}, {
                        wrapper => $config{bzr_wrapper},
                        wrappermode => (defined $config{bzr_wrappermode} ? $config{bzr_wrappermode} : "06755"),
                push @{$config{wrappers}}, {
                        wrapper => $config{bzr_wrapper},
                        wrappermode => (defined $config{bzr_wrappermode} ? $config{bzr_wrappermode} : "06755"),

diff --git a/IkiWiki/Rcs/git.pm b/IkiWiki/Rcs/git.pm
index f8614e4a15f97f533819a5524e9e076c8f3b62b2..6c9aca650ee3ab09751ef307aae2febd11a95280 100644 (file)
--- a/IkiWiki/Rcs/git.pm
+++ b/IkiWiki/Rcs/git.pm
@@ -21,7 +21,7 @@ hook(type => "checkconfig", id => "git", call => sub { #{{{
        if (! defined $config{gitmaster_branch}) {
                $config{gitmaster_branch}="master";
        }
        if (! defined $config{gitmaster_branch}) {
                $config{gitmaster_branch}="master";
        }

-       if (exists $config{git_wrapper}) {
+       if (length $config{git_wrapper}) {

                push @{$config{wrappers}}, {
                        wrapper => $config{git_wrapper},
                        wrappermode => (defined $config{git_wrappermode} ? $config{git_wrappermode} : "06755"),
                push @{$config{wrappers}}, {
                        wrapper => $config{git_wrapper},
                        wrappermode => (defined $config{git_wrappermode} ? $config{git_wrappermode} : "06755"),

diff --git a/IkiWiki/Rcs/mercurial.pm b/IkiWiki/Rcs/mercurial.pm
index 0cc1e291dfa46ea6e145feaf7ac229fc895f8684..3a98e09d8721c24030e988bdf6473a661e3cc695 100644 (file)
--- a/IkiWiki/Rcs/mercurial.pm
+++ b/IkiWiki/Rcs/mercurial.pm
@@ -12,7 +12,7 @@ hook(type => "checkconfig", id => "mercurial", call => sub { #{{{
        if (! defined $config{diffurl}) {
                $config{diffurl}="";
        }
        if (! defined $config{diffurl}) {
                $config{diffurl}="";
        }

-       if (exists $config{mercurial_wrapper}) {
+       if (length $config{mercurial_wrapper}) {

                push @{$config{wrappers}}, {
                        wrapper => $config{mercurial_wrapper},
                        wrappermode => (defined $config{mercurial_wrappermode} ? $config{mercurial_wrappermode} : "06755"),
                push @{$config{wrappers}}, {
                        wrapper => $config{mercurial_wrapper},
                        wrappermode => (defined $config{mercurial_wrappermode} ? $config{mercurial_wrappermode} : "06755"),

diff --git a/IkiWiki/Rcs/monotone.pm b/IkiWiki/Rcs/monotone.pm
index 5e8579b2fb13e07884d0586afb212e2d00fcf270..d7e8f296a69f6d80c205ebbcaa4e40f3dc49e8a3 100644 (file)
--- a/IkiWiki/Rcs/monotone.pm
+++ b/IkiWiki/Rcs/monotone.pm
@@ -41,7 +41,7 @@ hook(type => "checkconfig", id => "monotone", call => sub { #{{{
                error("Monotone version too old, is $version but required 0.38");
        }
 
                error("Monotone version too old, is $version but required 0.38");
        }
 

-       if (exists $config{mtn_wrapper}) {
+       if (length $config{mtn_wrapper}) {

                push @{$config{wrappers}}, {
                        wrapper => $config{mtn_wrapper},
                        wrappermode => (defined $config{mtn_wrappermode} ? $config{mtn_wrappermode} : "06755"),
                push @{$config{wrappers}}, {
                        wrapper => $config{mtn_wrapper},
                        wrappermode => (defined $config{mtn_wrappermode} ? $config{mtn_wrappermode} : "06755"),

diff --git a/IkiWiki/Rcs/svn.pm b/IkiWiki/Rcs/svn.pm
index e34d8fe3ead1b5493911d361a43c6329d925ed2c..0e7df36595b10de27319efdd7a2ffd0c6e93ca62 100644 (file)
--- a/IkiWiki/Rcs/svn.pm
+++ b/IkiWiki/Rcs/svn.pm
@@ -20,7 +20,7 @@ hook(type => "checkconfig", id => "svn", call => sub { #{{{
                $config{svnpath}=~s/\/$//;
                $config{svnpath}=~s/^\///;
        }
                $config{svnpath}=~s/\/$//;
                $config{svnpath}=~s/^\///;
        }

-       if (exists $config{svn_wrapper}) {
+       if (length $config{svn_wrapper}) {

                push @{$config{wrappers}}, {
                        wrapper => $config{svn_wrapper},
                        wrappermode => (defined $config{svn_wrappermode} ? $config{svn_wrappermode} : "04755"),
                push @{$config{wrappers}}, {
                        wrapper => $config{svn_wrapper},
                        wrappermode => (defined $config{svn_wrappermode} ? $config{svn_wrappermode} : "04755"),

diff --git a/IkiWiki/Rcs/tla.pm b/IkiWiki/Rcs/tla.pm
index 53c198032424a8a826c0dba5d8edd9b667d27633..e1389a34677e5b4fa1f3ade6acc10891bd2d0d0b 100644 (file)
--- a/IkiWiki/Rcs/tla.pm
+++ b/IkiWiki/Rcs/tla.pm
@@ -10,7 +10,7 @@ hook(type => "checkconfig", id => "tla", call => sub { #{{{
        if (! defined $config{diffurl}) {
                $config{diffurl}="";
        }
        if (! defined $config{diffurl}) {
                $config{diffurl}="";
        }

-       if (exists $config{tla_wrapper}) {
+       if (length $config{tla_wrapper}) {

                push @{$config{wrappers}}, {
                        wrapper => $config{tla_wrapper},
                        wrappermode => (defined $config{tla_wrappermode} ? $config{tla_wrappermode} : "06755"),
                push @{$config{wrappers}}, {
                        wrapper => $config{tla_wrapper},
                        wrappermode => (defined $config{tla_wrappermode} ? $config{tla_wrappermode} : "06755"),

diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm
index 92f1eadb58018f918ff76c04b2557ae589754515..38b7152029a851d0651943abd6ff772f76e6f364 100644 (file)
--- a/IkiWiki/Setup.pm
+++ b/IkiWiki/Setup.pm
@@ -67,7 +67,7 @@ sub load ($) { # {{{
                }
        }
        
                }
        }
        

-       if (exists $config{cgi_wrapper}) {
+       if (length $config{cgi_wrapper}) {

                push @{$config{wrappers}}, {
                        cgi => 1,
                        wrapper => $config{cgi_wrapper},
                push @{$config{wrappers}}, {
                        cgi => 1,
                        wrapper => $config{cgi_wrapper},

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index d1c53c0645c242dd5c3c4974156d66c00607f819..d96964a23b825970c61b7991334a398dfc64bcce 100644 (file)
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -71,9 +71,6 @@ sub dumpvalues ($@) { #{{{
                        push @ret, dumpline($key, $setup->{$key}, $info{type}, "");
                        delete $setup->{$key};
                }
                        push @ret, dumpline($key, $setup->{$key}, $info{type}, "");
                        delete $setup->{$key};
                }

-               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}, $info{type}, "#");
                }
                elsif (exists $info{example}) {
                        push @ret, dumpline($key, $info{example}, $info{type}, "#");
                }