Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

[git.ikiwiki.info.git] / ikiwiki-calendar

diff --git a/ikiwiki-calendar b/ikiwiki-calendar
index ec572cb7ce3373244188602b01f80a57b63ec053..a9548d6ec63813d2c150938f1df82ae5da2d6b4a 100755 (executable)
--- a/ikiwiki-calendar
+++ b/ikiwiki-calendar
@@ -15,7 +15,8 @@ GetOptions(
 ) || usage();
 my $setup=shift                || usage();
 my $pagespec=shift     || "*";
-my $year=shift         || 1900+(localtime(time))[5];
+my $startyear=shift    || 1900+(localtime(time))[5];
+my $endyear=shift      || $startyear;
 
 %config=IkiWiki::defaultconfig();
 IkiWiki::Setup::load($setup);
@@ -43,9 +44,7 @@ sub writearchive ($$;$) {
        }
 }
 
-IkiWiki::lockwiki();
-
-foreach my $y ($year-1, $year, $year+1) {
+foreach my $y ($startyear..$endyear) {
        writearchive("calendaryear.tmpl", $y);
        foreach my $m (qw{01 02 03 04 05 06 07 08 09 10 11 12}) {
                writearchive("calendarmonth.tmpl", $y, $m);
@@ -54,6 +53,5 @@ foreach my $y ($year-1, $year, $year+1) {
 
 IkiWiki::rcs_commit_staged(gettext("calendar update"), undef, undef)
        if $config{rcs};
-IkiWiki::unlockwiki();
 
 system("ikiwiki", "-setup", $setup, "-refresh");