From 6721f8a53fec2ad30d15b142968ab9c8e2e6ba1c Mon Sep 17 00:00:00 2001 From: mayeut Date: Tue, 13 Oct 2015 21:37:11 +0200 Subject: [PATCH] Correct unbound variable --- tools/travis-ci/install.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tools/travis-ci/install.sh b/tools/travis-ci/install.sh index ca5280ed..61debd95 100755 --- a/tools/travis-ci/install.sh +++ b/tools/travis-ci/install.sh @@ -55,9 +55,7 @@ if [ "${OPJ_CI_SKIP_TESTS:-}" != "1" ]; then OPJ_DATA_BRANCH=$(git -C ${OPJ_SOURCE_DIR} branch | grep '*' | tr -d '*[[:blank:]]') #default to same branch as we're setting up fi OPJ_DATA_HAS_BRANCH=$(git ls-remote --heads git://github.com/uclouvain/openjpeg-data.git ${OPJ_DATA_BRANCH} | wc -l) - if [ ${OPJ_DATA_HAS_BRANCH} -ne 0 ]; then - OPJ_DATA_BRANCH=${TRAVIS_BRANCH} - else + if [ ${OPJ_DATA_HAS_BRANCH} -eq 0 ]; then OPJ_DATA_BRANCH=master #default to master fi echo "Cloning openjpeg-data from ${OPJ_DATA_BRANCH} branch"