projects
/
ikiwiki.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
typo
[ikiwiki.git]
/
ikiwiki.in
diff --git
a/ikiwiki.in
b/ikiwiki.in
index 344b881489de4c31865a4abb610be4ddef2f0fa3..c79a2bfef98dd8ee6a3042bfdde919f3304534b0 100755
(executable)
--- a/
ikiwiki.in
+++ b/
ikiwiki.in
@@
-9,12
+9,12
@@
use strict;
use lib '.'; # For use in nonstandard directory, munged by Makefile.
use IkiWiki;
use lib '.'; # For use in nonstandard directory, munged by Makefile.
use IkiWiki;
-sub usage () {
#{{{
+sub usage () {
die gettext("usage: ikiwiki [options] source dest"), "\n",
gettext(" ikiwiki --setup configfile"), "\n";
die gettext("usage: ikiwiki [options] source dest"), "\n",
gettext(" ikiwiki --setup configfile"), "\n";
-}
#}}}
+}
-sub getconfig () {
#{{{
+sub getconfig () {
if (! exists $ENV{WRAPPED_OPTIONS}) {
%config=defaultconfig();
eval q{use Getopt::Long};
if (! exists $ENV{WRAPPED_OPTIONS}) {
%config=defaultconfig();
eval q{use Getopt::Long};
@@
-123,9
+123,9
@@
sub getconfig () { #{{{
loadplugins();
checkconfig();
}
loadplugins();
checkconfig();
}
-}
#}}}
+}
-sub main () {
#{{{
+sub main () {
getconfig();
if ($config{setup}) {
getconfig();
if ($config{setup}) {
@@
-135,7
+135,8
@@
sub main () { #{{{
if (@{$config{wrappers}} &&
! $config{render} && ! $config{dumpsetup} &&
if (@{$config{wrappers}} &&
! $config{render} && ! $config{dumpsetup} &&
- (! $config{refresh} || $config{genwrappers})) {
+ ((! $config{refresh} && ! $config{post_commit})
+ || $config{genwrappers})) {
debug(gettext("generating wrappers.."));
require IkiWiki::Wrapper;
my %origconfig=(%config);
debug(gettext("generating wrappers.."));
require IkiWiki::Wrapper;
my %origconfig=(%config);
@@
-157,13
+158,15
@@
sub main () { #{{{
}
# setup implies a wiki rebuild by default
}
# setup implies a wiki rebuild by default
- if (! $config{refresh} && ! $config{render}) {
+ if (! $config{refresh} && ! $config{render} &&
+ ! $config{post_commit}) {
$config{rebuild}=1;
}
}
if ($config{dumpsetup}) {
$config{rebuild}=1;
}
}
if ($config{dumpsetup}) {
- $config{srdir}=$config{destdir}="";
+ $config{srcdir}="" if ! defined $config{srcdir};
+ $config{destdir}="" if ! defined $config{destdir};
$config{syslog}=1 if $config{setupsyslog};
require IkiWiki::Setup;
IkiWiki::Setup::dump($config{dumpsetup});
$config{syslog}=1 if $config{setupsyslog};
require IkiWiki::Setup;
IkiWiki::Setup::dump($config{dumpsetup});
@@
-206,6
+209,6
@@
sub main () { #{{{
saveindex();
debug(gettext("done"));
}
saveindex();
debug(gettext("done"));
}
-}
#}}}
+}
main;
main;