From: mayeut <mayeut@users.noreply.github.com>
Date: Sat, 12 Sep 2015 01:13:45 +0000 (+0200)
Subject: Fix unbound variable
X-Git-Tag: v2.1.1~22^2~41^2~29
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=79819087544a29a792eb43b99638da401b7430ac;p=openjpeg

Fix unbound variable
---

diff --git a/tools/travis-ci/install.sh b/tools/travis-ci/install.sh
index f487ed36..5808f279 100755
--- a/tools/travis-ci/install.sh
+++ b/tools/travis-ci/install.sh
@@ -49,7 +49,7 @@ chmod +x jpylyzer/jpylyzer/jpylyzer.py
 # so long as such use or re-distribution is accompanied with this copyright notice and is not for commercial gain.
 # Note: Binaries can only be used for non-commercial purposes.
 if [ "${OPJ_NONCOMMERCIAL:-}" == "1" ]; then
-	if [ "${TRAVIS_OS_NAME:-}" == "linux" ]; then
+	if [ "${TRAVIS_OS_NAME:-}" == "linux" ] || uname -s | grep -i Linux &> /dev/null; then
 		echo "Retrieving Kakadu"
 		wget -q http://kakadusoftware.com/wp-content/uploads/2014/06/KDU77_Demo_Apps_for_Linux-x86-64_150710.zip
 		cmake -E tar -xf KDU77_Demo_Apps_for_Linux-x86-64_150710.zip
diff --git a/tools/travis-ci/run.sh b/tools/travis-ci/run.sh
index 36bcc0d4..65cc1c47 100755
--- a/tools/travis-ci/run.sh
+++ b/tools/travis-ci/run.sh
@@ -82,7 +82,11 @@ fi
 set -x
 if [ "${OPJ_NONCOMMERCIAL:-}" == "1" ] && [ -d kdu ]; then
 	if [ "${TRAVIS_OS_NAME}" == "linux" ]; then
-		export LD_LIBRARY_PATH=${PWD}/kdu:${LD_LIBRARY_PATH}
+		if [ "${LD_LIBRARY_PATH:-}" == "" ]; then
+			export LD_LIBRARY_PATH=${PWD}/kdu
+		else
+			export LD_LIBRARY_PATH=${PWD}/kdu:${LD_LIBRARY_PATH}
+		fi
 	fi
 	export PATH=${PWD}/kdu:${PATH}
 fi