-#!/usr/bin/perl -T
+#!/usr/bin/perl
$ENV{PATH}="/usr/local/bin:/usr/bin:/bin";
delete @ENV{qw{IFS CDPATH ENV BASH_ENV}};
use lib '.'; # For use in nonstandard directory, munged by Makefile.
use IkiWiki;
-sub usage () { #{{{
- die gettext("usage: ikiwiki [options] source dest"), "\n";
-} #}}}
+sub usage () {
+ 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};
Getopt::Long::Configure('pass_through');
GetOptions(
- "setup|s=s" => \$config{setup},
+ "setup|s=s" => sub {
+ require IkiWiki::Setup;
+ my $verbose=$config{verbose};
+ my $syslog=$config{syslog};
+ IkiWiki::Setup::load($_[1]);
+ $config{setupverbose}=$config{verbose};
+ $config{setupsyslog}=$config{syslog};
+ $config{verbose}=$verbose || $config{setupverbose};
+ $config{syslog}=$syslog;
+ $config{setup}=1;
+ },
"dumpsetup|s=s" => \$config{dumpsetup},
"wikiname=s" => \$config{wikiname},
"verbose|v!" => \$config{verbose},
"syslog!" => \$config{syslog},
"rebuild!" => \$config{rebuild},
"refresh!" => \$config{refresh},
+ "clean!" => \$config{clean},
"post-commit" => \$config{post_commit},
"render=s" => \$config{render},
"wrappers!" => \$config{genwrappers},
+ "wrappergroup=s" => \$config{wrappergroup},
"usedirs!" => \$config{usedirs},
"prefix-directives!" => \$config{prefix_directives},
"getctime" => \$config{getctime},
print "ikiwiki version $IkiWiki::version\n";
exit;
},
+ "help|h" => sub { $SIG{__WARN__}=sub {}; die },
) || usage();
- if (! $config{setup} && ! $config{render}) {
+ if (! $config{setup}) {
loadplugins();
if (@ARGV == 2) {
$config{srcdir} = possibly_foolish_untaint(shift @ARGV);
if ($@) {
error("WRAPPED_OPTIONS: $@");
}
+ delete $ENV{WRAPPED_OPTIONS};
+
loadplugins();
checkconfig();
}
-} #}}}
+}
-sub main () { #{{{
+sub main () {
getconfig();
if ($config{setup}) {
- require IkiWiki::Setup;
- IkiWiki::Setup::load($config{setup});
+ delete $config{setup};
+ loadplugins();
+ checkconfig();
+
if (@{$config{wrappers}} &&
! $config{render} && ! $config{dumpsetup} &&
- (! $config{refresh} || $config{genwrappers})) {
+ ! $config{clean} &&
+ ((! $config{refresh} && ! $config{post_commit})
+ || $config{genwrappers})) {
debug(gettext("generating wrappers.."));
require IkiWiki::Wrapper;
my %origconfig=(%config);
- my @wrappers=@{$config{wrappers}};
- delete $config{wrappers};
- delete $config{genwrappers};
- foreach my $wrapper (@wrappers) {
- %config=(%origconfig,
- rebuild => 0,
- verbose => 0,
- %{$wrapper},
- );
+ foreach my $wrapper (@{$config{wrappers}}) {
+ %config=(%origconfig, %{$wrapper});
+ $config{verbose}=$config{setupverbose}
+ if exists $config{setupverbose};
+ $config{syslog}=$config{setupsyslog}
+ if exists $config{setupsyslog};
+ delete @config{qw(setupsyslog setupverbose wrappers genwrappers rebuild)};
checkconfig();
- if (! $config{cgi} && ! $config{post_commit}) {
+ if (! $config{cgi} && ! $config{post_commit} &&
+ ! $config{test_receive}) {
$config{post_commit}=1;
}
gen_wrapper();
}
# setup implies a wiki rebuild by default
- if (! $config{refresh}) {
+ if (! $config{refresh} && ! $config{render} &&
+ ! $config{post_commit} && ! $config{clean}) {
$config{rebuild}=1;
}
-
- # ignore syslog setting from setup file
- # while doing initial setup
- $config{syslog}=0 unless $config{dumpsetup};
-
- loadplugins();
- checkconfig();
}
if ($config{dumpsetup}) {
+ $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});
}
elsif ($config{post_commit} && ! commit_hook_enabled()) {
# do nothing
}
+ elsif ($config{clean}) {
+ require IkiWiki::Render;
+ foreach my $wrapper (@{$config{wrappers}}) {
+ prune($wrapper->{wrapper});
+ }
+ clean_rendered();
+ system("rm", "-rf", $config{wikistatedir});
+ }
else {
- if (! $config{refresh}) {
+ if ($config{rebuild}) {
debug(gettext("rebuilding wiki.."));
}
else {
saveindex();
debug(gettext("done"));
}
-} #}}}
+}
main;