From d42a102bf4f1f92f23864fde22a47c3cdab54a73 Mon Sep 17 00:00:00 2001
From: "Bradley M. Kuhn" <bkuhn@ebb.org>
Date: Sat, 30 Nov 2013 14:20:07 -0500
Subject: [PATCH] Better test for executable.

---
 calendar-export.plx | 3 ++-
 calendar-import.plx | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/calendar-export.plx b/calendar-export.plx
index 2fe7403..320cf7f 100755
--- a/calendar-export.plx
+++ b/calendar-export.plx
@@ -551,7 +551,8 @@ $config->{scrubPrivate} = 0 if not defined $config->{scrubPrivate};
 $config->{reportProblems} = $config->{user} if not defined $config->{reportProblems};
 $config->{emacsBinary} = "/usr/bin/emacs" if not defined $config->{emacsBinary};
 $config->{calendarStyle} = 'plain' if not defined $config->{calendarStyle};
-DieLog("$config->{emacsBinary} doesn't appear to be executable") unless -x $config->{emacsBinary};
+DieLog("$config->{emacsBinary} doesn't appear to be executable for $bin")
+    unless defined $config->{emacsBinary} and -x $config->{emacsBinary};
 
 if (defined $config->{cleanOutputDirFirst} and $config->{cleanOutputDirFirst}) {
   chdir $config->{outputDir} or die "unable to change directory to $config->{outputDir} $? $!";
diff --git a/calendar-import.plx b/calendar-import.plx
index 760ddf9..e2889f2 100755
--- a/calendar-import.plx
+++ b/calendar-import.plx
@@ -329,7 +329,8 @@ $config->{reportProblems} = $config->{user} if not defined $config->{reportProbl
 $config->{emacsBinary} = "/usr/bin/emacs" if not defined $config->{emacsBinary};
 $config->{calendarStyle} = 'plain' if not defined $config->{calendarStyle};
 foreach my $bin (qw/emacsBinary gitBinary/) {
-  DieLog("$config->{$bin} doesn't appear to be executable") unless -x $config->{$bin};
+  DieLog("$config->{$bin} doesn't appear to be executable for $bin")
+    unless defined $config->{$bin} and -x $config->{$bin};
 }
 
 DieLog("$CONFIG_FILE doesn't specify a (readable) Git directory via gitDir setting: $!")