bkuhn/small-hacks
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Better test for executable.

Browse source
This commit is contained in:
Bradley M. Kuhn 2013-11-30 14:20:07 -05:00
parent 1a2d1359dc
commit d42a102bf4
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
calendar-export.plx
View file

@ -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} $? $!";

3
calendar-import.plx
View file

@ -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: $!")