From f6493ed47952ae14c3de00f58d0f1479a1b57578 Mon Sep 17 00:00:00 2001
From: Lorenz Meier <lm@inf.ethz.ch>
Date: Sat, 20 Feb 2016 15:34:46 +0100
Subject: [PATCH] Android build debugging

---
 .travis.yml                     | 1 +
 tools/update_android_version.sh | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 51dd2672d..a82f25036 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -114,6 +114,7 @@ before_script:
   - if [ "${CONFIG}" != "doxygen" ]; then mkdir ${SHADOW_BUILD_DIR} && cd ${SHADOW_BUILD_DIR} && qmake -r ${TRAVIS_BUILD_DIR}/qgroundcontrol.pro CONFIG+=${CONFIG} CONFIG+=WarningsAsErrorsOn -spec ${SPEC}; fi
 
 script:
+  - echo "Build dir: ${TRAVIS_BUILD_DIR}"
   - cd ${TRAVIS_BUILD_DIR} && ./tools/update_android_version.sh
   - echo 'Building QGroundControl' && echo -en 'travis_fold:start:script.1\\r'
   - if [ "${CONFIG}" != "doxygen" ]; then cd ${SHADOW_BUILD_DIR} && make -j4; fi
diff --git a/tools/update_android_version.sh b/tools/update_android_version.sh
index 4bee2ab5b..02cdafff5 100755
--- a/tools/update_android_version.sh
+++ b/tools/update_android_version.sh
@@ -1,4 +1,4 @@
-#! /bin/bash
+#!/usr/bin/env bash
 
 MANIFEST_FILE=android/AndroidManifest.xml
 
@@ -10,12 +10,16 @@ echo "VersionName: ${VERSIONNAME}"
 
 if [ -n "$VERSIONCODE" ]; then
 	sed -i -e "s/android:versionCode=\"[0-9][0-9]*\"/android:versionCode=\"$VERSIONCODE\"/" $MANIFEST_FILE
+	echo "Android version: ${VERSIONCODE}"
 else
 	echo "Error versionCode empty"
+	exit 1
 fi
 
 if [ -n "$VERSIONNAME" ]; then
 	sed -i -e 's/versionName *= *"[^"]*"/versionName="'$VERSIONNAME'"/' $MANIFEST_FILE
+	echo "Android name: ${VERSIONNAME}"
 else
 	echo "Error versionName empty"
+	exit 1
 fi
-- 
2.22.0