projects
/
ikiwiki.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
The ikiwiki zombie army release.
[ikiwiki.git]
/
ikiwiki.in
diff --git
a/ikiwiki.in
b/ikiwiki.in
index d18970d0f931bbb7975552bea63b9e7a88a59eb3..2aeaf94ecedc4ffd210d9c774dab983a58050f2d 100755
(executable)
--- a/
ikiwiki.in
+++ b/
ikiwiki.in
@@
-10,7
+10,7
@@
use lib '.'; # For use in nonstandard directory, munged by Makefile.
use IkiWiki;
sub usage () { #{{{
use IkiWiki;
sub usage () { #{{{
- die
"usage: ikiwiki [options] source dest
\n";
+ die
gettext("usage: ikiwiki [options] source dest"), "
\n";
} #}}}
sub getconfig () { #{{{
} #}}}
sub getconfig () { #{{{
@@
-25,13
+25,14
@@
sub getconfig () { #{{{
"syslog!" => \$config{syslog},
"rebuild!" => \$config{rebuild},
"refresh!" => \$config{refresh},
"syslog!" => \$config{syslog},
"rebuild!" => \$config{rebuild},
"refresh!" => \$config{refresh},
+ "post-commit" => \$config{post_commit},
"render=s" => \$config{render},
"wrappers!" => \$config{wrappers},
"render=s" => \$config{render},
"wrappers!" => \$config{wrappers},
+ "usedirs!" => \$config{usedirs},
"getctime" => \$config{getctime},
"getctime" => \$config{getctime},
- "
wrappermode=i" => \$config{wrappermode
},
+ "
numbacklinks=i" => \$config{numbacklinks
},
"rcs=s" => \$config{rcs},
"no-rcs" => sub { $config{rcs}="" },
"rcs=s" => \$config{rcs},
"no-rcs" => sub { $config{rcs}="" },
- "anonok!" => \$config{anonok},
"cgi!" => \$config{cgi},
"discussion!" => \$config{discussion},
"w3mmode!" => \$config{w3mmode},
"cgi!" => \$config{cgi},
"discussion!" => \$config{discussion},
"w3mmode!" => \$config{w3mmode},
@@
-46,6
+47,9
@@
sub getconfig () { #{{{
"timeformat=s" => \$config{timeformat},
"sslcookie!" => \$config{sslcookie},
"httpauth!" => \$config{httpauth},
"timeformat=s" => \$config{timeformat},
"sslcookie!" => \$config{sslcookie},
"httpauth!" => \$config{httpauth},
+ "userdir=s" => \$config{userdir},
+ "htmlext=s" => \$config{htmlext},
+ "libdir=s" => \$config{libdir},
"exclude=s@" => sub {
push @{$config{wiki_file_prune_regexps}}, $_[1];
},
"exclude=s@" => sub {
push @{$config{wiki_file_prune_regexps}}, $_[1];
},
@@
-59,17
+63,27
@@
sub getconfig () { #{{{
$config{underlaydir}=possibly_foolish_untaint($_[1])
},
"wrapper:s" => sub {
$config{underlaydir}=possibly_foolish_untaint($_[1])
},
"wrapper:s" => sub {
- $config{wrapper}=$_[1] ? $_[1] : "ikiwiki-wrap"
+ $config{wrapper}=$_[1] ? possibly_foolish_untaint($_[1]) : "ikiwiki-wrap"
+ },
+ "wrappermode=i" => sub {
+ $config{wrappermode}=possibly_foolish_untaint($_[1])
},
"plugin=s@" => sub {
push @{$config{plugin}}, $_[1];
},
"disable-plugin=s@" => sub {
},
"plugin=s@" => sub {
push @{$config{plugin}}, $_[1];
},
"disable-plugin=s@" => sub {
-
$config{plugin}=[grep { $_ ne $_[1] } @{$config{plugin}}
];
+
push @{$config{disable_plugins}}, $_[1
];
},
"pingurl=s" => sub {
push @{$config{pingurl}}, $_[1];
},
},
"pingurl=s" => sub {
push @{$config{pingurl}}, $_[1];
},
+ "set=s" => sub {
+ my ($var, $val)=split('=', $_[1], 2);
+ if (! defined $var || ! defined $val) {
+ die gettext("usage: --set var=value"), "\n";
+ }
+ $config{$var}=$val;
+ },
"version" => sub {
print "ikiwiki version $IkiWiki::version\n";
exit;
"version" => sub {
print "ikiwiki version $IkiWiki::version\n";
exit;
@@
-99,12
+113,7
@@
sub getconfig () { #{{{
sub main () { #{{{
getconfig();
sub main () { #{{{
getconfig();
- if ($config{cgi}) {
- loadindex();
- require IkiWiki::CGI;
- cgi();
- }
- elsif ($config{setup}) {
+ if ($config{setup}) {
require IkiWiki::Setup;
setup();
}
require IkiWiki::Setup;
setup();
}
@@
-113,10
+122,21
@@
sub main () { #{{{
require IkiWiki::Wrapper;
gen_wrapper();
}
require IkiWiki::Wrapper;
gen_wrapper();
}
+ elsif ($config{cgi}) {
+ loadindex();
+ require IkiWiki::CGI;
+ cgi();
+ }
elsif ($config{render}) {
require IkiWiki::Render;
commandline_render();
}
elsif ($config{render}) {
require IkiWiki::Render;
commandline_render();
}
+ elsif ($config{post_commit} && ! commit_hook_enabled()) {
+ if ($config{notify}) {
+ loadindex();
+ rcs_notify();
+ }
+ }
else {
lockwiki();
loadindex();
else {
lockwiki();
loadindex();