From 1a960233af7ccbff15c59141c0871437308c515d Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Mon, 2 Nov 2015 13:31:52 -0500
Subject: [PATCH] android only update AndroidManifest if versionCode not empty

---
 .travis.yml                     |  2 +-
 tools/update_android_version.sh | 13 +++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8bbfe28b9..3a8537dda 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -65,7 +65,7 @@ cache:
 
 
 before_install:
-  - cd ${TRAVIS_BUILD_DIR} && git fetch --unshallow && git fetch --tags
+  - cd ${TRAVIS_BUILD_DIR} && git fetch --unshallow && git fetch --all --tags
   - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then mkdir -p ~/.config/QtProject/ && cp ${TRAVIS_BUILD_DIR}/test/qtlogging.ini ~/.config/QtProject/; fi
   - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then mkdir -p ~/Library/Preferences/QtProject/ && cp ${TRAVIS_BUILD_DIR}/test/qtlogging.ini ~/Library/Preferences/QtProject/; fi
   - if [ "${TRAVIS_OS_NAME}" = "android" ]; then wget https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/gstreamer-1.0-android-armv7-1.5.2.tar.bz2 && mkdir -p ${TRAVIS_BUILD_DIR}/gstreamer-1.0-android-armv7-1.5.2 && tar jxf gstreamer-1.0-android-armv7-1.5.2.tar.bz2 -C ${TRAVIS_BUILD_DIR}/gstreamer-1.0-android-armv7-1.5.2; fi
diff --git a/tools/update_android_version.sh b/tools/update_android_version.sh
index cb81634fa..4bee2ab5b 100755
--- a/tools/update_android_version.sh
+++ b/tools/update_android_version.sh
@@ -8,5 +8,14 @@ VERSIONNAME=`git describe --always --tags | sed -e 's/^v//'`
 echo "VersionCode: ${VERSIONCODE}"
 echo "VersionName: ${VERSIONNAME}"
 
-sed -i -e "s/android:versionCode=\"[0-9][0-9]*\"/android:versionCode=\"${VERSIONCODE}\"/" $MANIFEST_FILE
-sed -i -e 's/versionName *= *"[^"]*"/versionName="'$VERSIONNAME'"/' $MANIFEST_FILE
+if [ -n "$VERSIONCODE" ]; then
+	sed -i -e "s/android:versionCode=\"[0-9][0-9]*\"/android:versionCode=\"$VERSIONCODE\"/" $MANIFEST_FILE
+else
+	echo "Error versionCode empty"
+fi
+
+if [ -n "$VERSIONNAME" ]; then
+	sed -i -e 's/versionName *= *"[^"]*"/versionName="'$VERSIONNAME'"/' $MANIFEST_FILE
+else
+	echo "Error versionName empty"
+fi
-- 
2.22.0