From cff22b28ae936669458e4298ac8a5f18fe88534a Mon Sep 17 00:00:00 2001
From: "Bradley M. Kuhn" <bkuhn@ebb.org>
Date: Mon, 10 Feb 2014 08:53:02 -0500
Subject: [PATCH] Move die from cleanup to be below test of directory writable.
 It's possible this cleanup code is causing serious problems during failures,
 because it's leaving us no ics files when the export fails.  Probably it
 would be better if we move aside the ics files and restore them later.

---
 calendar-export.plx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/calendar-export.plx b/calendar-export.plx
index 056b7e4..58780f6 100755
--- a/calendar-export.plx
+++ b/calendar-export.plx
@@ -562,14 +562,14 @@ $config->{calendarStyle} = 'plain' if not defined $config->{calendarStyle};
 DieLog("$config->{emacsBinary} doesn't appear to be executable for $config->{emacsBinary}")
     unless defined $config->{emacsBinary} and -x $config->{emacsBinary};
 
+DieLog("$CONFIG_FILE doesn't specify a (readable) output directory via outputDir setting: $!")
+  unless defined $config->{outputDir} and -d $config->{outputDir};
+
 if (defined $config->{cleanOutputDirFirst} and $config->{cleanOutputDirFirst}) {
   chdir $config->{outputDir} or die "unable to change directory to $config->{outputDir} $? $!";
   system("/bin/rm -f *.ics");
 }
 
-DieLog("$CONFIG_FILE doesn't specify a (readable) output directory via outputDir setting: $!")
-  unless defined $config->{outputDir} and -d $config->{outputDir};
-
 unless ((defined $config->{publicDiary} and -r $config->{publicDiary}) or
     (defined $config->{privateyDiary} and -r $config->{privateDiary})) {
   foreach my $key (qw/publicDiary privateDiary/) {