slightly better latout

[git.ikiwiki.info.git] / ikiwiki

diff --git a/ikiwiki b/ikiwiki
index b59aa8c8fa6c1cdfbe3504f01dd2b18c15f5b863..6f66c5ea4f5abec26f2ce8947407ac934bbf3a19 100755 (executable)
--- a/ikiwiki
+++ b/ikiwiki
@@ -7,7 +7,6 @@ use lib '.'; # For use without installation, removed by Makefile.
 package IkiWiki;
 use warnings;
 use strict;
-use Memoize;
 use File::Spec;
 use HTML::Template;
 
@@ -425,28 +424,29 @@ sub globlist_match ($$) { #{{{
        return 0;
 } #}}}
 
-# main {{{
-memoize('pagename');
-memoize('bestlink');
-if ($config{setup}) {
-       require IkiWiki::Setup;
-       setup();
-}
-lockwiki();
-if ($config{wrapper}) {
-       require IkiWiki::Wrapper;
-       gen_wrapper();
-       exit;
-}
-loadindex() unless $config{rebuild};
-if ($config{cgi}) {
-       require IkiWiki::CGI;
-       cgi();
-}
-else {
-       require IkiWiki::Render;
-       rcs_update();
-       refresh();
-       saveindex();
-}
-#}}}
+sub main () { #{{{
+       if ($config{setup}) {
+               require IkiWiki::Setup;
+               setup();
+       }
+       elsif ($config{wrapper}) {
+               lockwiki();
+               require IkiWiki::Wrapper;
+               gen_wrapper();
+       }
+       elsif ($config{cgi}) {
+               lockwiki();
+               require IkiWiki::CGI;
+               cgi();
+       }
+       else {
+               lockwiki();
+               loadindex() unless $config{rebuild};
+               require IkiWiki::Render;
+               rcs_update();
+               refresh();
+               saveindex();
+       }
+} #}}}
+
+main;