From dc0aa994594fd24858da1c51f6cd4b37db5cf533 Mon Sep 17 00:00:00 2001 From: Steve Purcell Date: Tue, 27 Nov 2012 16:24:44 +0000 Subject: [PATCH] Simplify travis run script, and make it work when ECUKES_EMACS has a space in the path Yes, on OS X, one might have: ECUKES_EMACS='/Applications/Emacs 23.app/Contents/MacOS/Emacs' --- run-travis-ci.sh | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/run-travis-ci.sh b/run-travis-ci.sh index 2af9086..f48064a 100755 --- a/run-travis-ci.sh +++ b/run-travis-ci.sh @@ -1,20 +1,12 @@ -#!/bin/sh +#!/bin/sh -e cd "$(dirname "$0")" -set_default () { - eval " -if [ -z \$$1 ]; then - $1=$2 -fi -" -} - -set_default ECUKES_EMACS "$(which emacs)" +ECUKES_EMACS=${ECUKES_EMACS:-$(which emacs)} echo "*** Emacs version ***" -echo "ECUKES_EMACS =" $(which $ECUKES_EMACS) -$ECUKES_EMACS --version +echo "ECUKES_EMACS = $ECUKES_EMACS" +"$ECUKES_EMACS" --version echo exec ./util/ecukes/ecukes --graphical