From ba03552b873400536a30bc9570ed63a293c36e6f Mon Sep 17 00:00:00 2001 From: Ralph Lange Date: Tue, 26 Nov 2019 14:38:51 +0100 Subject: [PATCH] travis: make setting EPICS_HOST_ARCH more robust --- travis/prepare.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/travis/prepare.sh b/travis/prepare.sh index 671c018..fed3739 100755 --- a/travis/prepare.sh +++ b/travis/prepare.sh @@ -51,8 +51,8 @@ fold_start set.up.epics_build "Setting up EPICS build system" eval $(grep "EPICS_BASE=" ${CACHEDIR}/RELEASE.local) echo "EPICS_BASE=$EPICS_BASE" - -[ "$EPICS_HOST_ARCH" ] || EPICS_HOST_ARCH=$(sh $EPICS_BASE/startup/EpicsHostArch) +[ -z "$EPICS_HOST_ARCH" -a -f $EPICS_BASE/src/tools/EpicsHostArch.pl ] && EPICS_HOST_ARCH=$(perl $EPICS_BASE/src/tools/EpicsHostArch.pl) +[ -z "$EPICS_HOST_ARCH" -a -f $EPICS_BASE/startup/EpicsHostArch.pl ] && EPICS_HOST_ARCH=$(perl $EPICS_BASE/startup/EpicsHostArch.pl) echo "EPICS_HOST_ARCH=$EPICS_HOST_ARCH" if echo ${modules_to_compile} | grep -q "$EPICS_BASE"