From 63517baef2f2e2d2e1ea10d4952189ef377da635 Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Mon, 22 Sep 2014 15:37:03 -0400 Subject: [PATCH] 3894: Fix -n that should have been -z. Flatten condition. --- jenkins/run-tests.sh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/jenkins/run-tests.sh b/jenkins/run-tests.sh index 742baeb..2b52830 100755 --- a/jenkins/run-tests.sh +++ b/jenkins/run-tests.sh @@ -156,11 +156,9 @@ done echo "WORKSPACE=$WORKSPACE" [[ -n "$WORKSPACE" ]] || fatal "WORKSPACE not set" -if [[ -n "$CONFIGSRC" ]]; then - if [[ -d "$HOME/arvados-api-server" ]]; then - # Jenkins expects us to use this by default. - CONFIGSRC="$HOME/arvados-api-server" - fi +if [[ -z "$CONFIGSRC" ]] && [[ -d "$HOME/arvados-api-server" ]]; then + # Jenkins expects us to use this by default. + CONFIGSRC="$HOME/arvados-api-server" fi # Set up temporary install dirs (unless existing dirs were supplied) -- 2.30.2