Simplify some tests

Because `[ "$foo" != "" ] is equivalent to `[ "$foo" ]'
in all POSIX shells.

Signed-off-by: Cristian Ionescu-Idbohrn <cristian.ionescu-idbohrn@axis.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Cristian Ionescu-Idbohrn 2017-02-08 18:03:49 +01:00 committed by Dirk Hohndel
parent 1c33951ce6
commit e8923a9bad

View file

@ -49,7 +49,7 @@ for i in git cmake autoconf libtool java ant wget unzip; do
MISSING="${MISSING}${i} " MISSING="${MISSING}${i} "
fi fi
done done
if [ "$MISSING" != "" ] ; then if [ "$MISSING" ] ; then
echo "The following packages are missing: $MISSING" echo "The following packages are missing: $MISSING"
echo "Please install via your package manager." echo "Please install via your package manager."
exit 1 exit 1
@ -132,7 +132,7 @@ fi
rm -f ./subsurface-mobile-build-arm/bin/QtApp-debug.apk rm -f ./subsurface-mobile-build-arm/bin/QtApp-debug.apk
rm -d ./subsurface-mobile-build-arm/AndroidManifest.xml rm -d ./subsurface-mobile-build-arm/AndroidManifest.xml
rm -d ./subsurface-mobile-build-arm/bin/AndroidManifest.xml rm -d ./subsurface-mobile-build-arm/bin/AndroidManifest.xml
if [ "$USE_X" != "" ] ; then if [ "$USE_X" ] ; then
bash "$USE_X" subsurface/packaging/android/build.sh "$RELEASE" -buildnr "$BUILDNR" arm "$@" bash "$USE_X" subsurface/packaging/android/build.sh "$RELEASE" -buildnr "$BUILDNR" arm "$@"
else else
bash subsurface/packaging/android/build.sh "$RELEASE" -buildnr "$BUILDNR" arm "$@" bash subsurface/packaging/android/build.sh "$RELEASE" -buildnr "$BUILDNR" arm "$@"