projects
/
ikiwiki.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add passwordauth to basewiki.mdwn.
[ikiwiki.git]
/
ikiwiki.in
diff --git
a/ikiwiki.in
b/ikiwiki.in
index ad25582581e38fffa807c9b6a4594c1b65ca29de..b8acd61ea2c508d12e788764e01a1e3fc724e5ff 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,15
@@
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},
"wrappermode=i" => \$config{wrappermode},
"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,8
+48,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},
"exclude=s@" => sub {
"exclude=s@" => sub {
- push @{$config{wiki_file_prune_regexp}}, $_[1];
+ push @{$config{wiki_file_prune_regexp
s
}}, $_[1];
},
"adminuser=s@" => sub {
push @{$config{adminuser}}, $_[1]
},
"adminuser=s@" => sub {
push @{$config{adminuser}}, $_[1]
@@
-65,7
+68,7
@@
sub getconfig () { #{{{
push @{$config{plugin}}, $_[1];
},
"disable-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];
@@
-117,6
+120,12
@@
sub main () { #{{{
require IkiWiki::Render;
commandline_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();