From 1f172c36f75f3c8c61359057ba2aa8ea609e66e7 Mon Sep 17 00:00:00 2001 From: "Bradley M. Kuhn" Date: Fri, 29 Nov 2013 16:16:47 -0500 Subject: [PATCH] Emacs binary setup. --- calendar-export.plx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) mode change 100644 => 100755 calendar-export.plx diff --git a/calendar-export.plx b/calendar-export.plx old mode 100644 new mode 100755 index 373ec31..95d5e15 --- a/calendar-export.plx +++ b/calendar-export.plx @@ -304,7 +304,7 @@ ELISP_END if defined $publicCalendarFile; $elispFH->close(); - my @emacsOutput = read_from_process($EMACS, '--no-windows', + my @emacsOutput = read_from_process($emacsSettings->{emacsBinary}, '--no-windows', '--batch', '--no-site-file', '-l', $elispFile); DieLog("Emacs process for exporting $privateCalendarFile and " . "$publicCalendarFile exited with non-zero exit status of " . @@ -520,8 +520,11 @@ my $config = ReadConfig($CONFIG_FILE); $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}; -DieLog("$CONFIG_FILE doesn't specify an output directory via outputDir setting") +DieLog("$config->{emacsBinary} doesn't appear to be executable") unless -x $config->{emacsBinary}; + +DieLog("$CONFIG_FILE doesn't specify a (readable) output directory via outputDir setting: $!") unless defined $config->{outputDir} and -d $config->{outputDir}; DieLog("$CONFIG_FILE doesn't specify a readable public nor a private diary file")