projects
/
ikiwiki.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into commentreorg
[ikiwiki.git]
/
ikiwiki-calendar.in
diff --git
a/ikiwiki-calendar.in
b/ikiwiki-calendar.in
index 9738ea5f7195cef46bf6480fc5c515fd89438cbe..04352b97050905dfd853a3a1b64228137e12dc69 100755
(executable)
--- a/
ikiwiki-calendar.in
+++ b/
ikiwiki-calendar.in
@@
-15,7
+15,10
@@
GetOptions(
"force" => \$force,
) || usage();
my $setup=shift || usage();
"force" => \$force,
) || usage();
my $setup=shift || usage();
-my $pagespec=shift || "*";
+my $pagespec;
+if (@ARGV && $ARGV[0] !~ /^\d+$/) {
+ $pagespec=shift;
+}
my $startyear=shift || 1900+(localtime(time))[5];
my $endyear=shift || $startyear;
my $startyear=shift || 1900+(localtime(time))[5];
my $endyear=shift || $startyear;
@@
-27,6
+30,10
@@
IkiWiki::checkconfig();
my $archivebase = 'archives';
$archivebase = $config{archivebase} if defined $config{archivebase};
my $archivebase = 'archives';
$archivebase = $config{archivebase} if defined $config{archivebase};
+if (! defined $pagespec) {
+ $pagespec=$config{archive_pagespec} || "*";
+}
+
sub writearchive ($$;$) {
my $template=template(shift);
my $year=shift;
sub writearchive ($$;$) {
my $template=template(shift);
my $year=shift;
@@
-55,4
+62,5
@@
foreach my $y ($startyear..$endyear) {
IkiWiki::rcs_commit_staged(gettext("calendar update"), undef, undef)
if $config{rcs};
IkiWiki::rcs_commit_staged(gettext("calendar update"), undef, undef)
if $config{rcs};
-system("ikiwiki", "-setup", $setup, "-refresh");
+exec("ikiwiki", "-setup", $setup, "-refresh");
+die "failed to run ikiwiki -setup $setup -refresh\n";