diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2017-02-04 07:02:11 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2017-02-04 07:02:11 -0800 |
| commit | 911d2798cdb291a5781f2c212d4b7561d861b82a (patch) | |
| tree | eecef6a6560006c5b3cb12aa33da77886fbdbee0 | |
| parent | 9a754b663a2751f2ca86c636d6a1c55f0cf23912 (diff) | |
| download | subsurface-911d2798cdb291a5781f2c212d4b7561d861b82a.tar.gz | |
Android build wrapper: sometimes quotes hurt you
Shellcheck wanted quotes around "$USE_X" - but that makes the script
fail if you run it without the '-x' argument.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | packaging/android/android-build-wrapper.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/packaging/android/android-build-wrapper.sh b/packaging/android/android-build-wrapper.sh index 523283f35..41e412579 100644 --- a/packaging/android/android-build-wrapper.sh +++ b/packaging/android/android-build-wrapper.sh @@ -131,7 +131,11 @@ fi rm -f ./subsurface-mobile-build-arm/bin/QtApp-debug.apk rm -d ./subsurface-mobile-build-arm/AndroidManifest.xml rm -d ./subsurface-mobile-build-arm/bin/AndroidManifest.xml -bash "$USE_X" subsurface/packaging/android/build.sh "$RELEASE" -buildnr "$BUILDNR" arm "$@" +if [ "$USE_X" != "" ] ; then + bash "$USE_X" subsurface/packaging/android/build.sh "$RELEASE" -buildnr "$BUILDNR" arm "$@" +else + bash subsurface/packaging/android/build.sh "$RELEASE" -buildnr "$BUILDNR" arm "$@" +fi ls -l ./subsurface-mobile-build-arm/bin/*.apk |