From 0072495fc32f88d34507a3aa054b8727be7e964a Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Tue, 26 Jul 2016 22:11:32 -0400
Subject: [PATCH] travis-ci fix s3 deploy location

---
 .travis.yml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d169a2379..3dafcca1c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -153,7 +153,9 @@ before_script:
 
   # insert QGC version in AndroidManifest.xml
   - if [ "${SPEC}" = "android-g++" ]; then
-        tools/update_android_version.sh;
+        git remote set-branches origin 'master' &&
+        git fetch origin master &&
+        ./tools/update_android_version.sh;
     fi
 
 script:
@@ -192,15 +194,14 @@ after_success:
         pip install --user google-api-python-client PyOpenSSL &&
         echo "Google Play Track:" ${GOOGLE_PLAY_TRACK} &&
         openssl aes-256-cbc -K $encrypted_25db6eb7c3fd_key -iv $encrypted_25db6eb7c3fd_iv -in android/Google_Play_Android_Developer-4432a3c4f5d1.json.enc -out android/Google_Play_Android_Developer-4432a3c4f5d1.json -d &&
-        tools/google_play_upload.py ${GOOGLE_PLAY_TRACK} org.mavlink.qgroundcontrol ${SHADOW_BUILD_DIR}/release/package/QGroundControl.apk
-        ;
+        ./tools/google_play_upload.py ${GOOGLE_PLAY_TRACK} org.mavlink.qgroundcontrol ${SHADOW_BUILD_DIR}/release/package/QGroundControl.apk;
     fi
 
 before_deploy:
   # create linux appimage
   - cd ${TRAVIS_BUILD_DIR}
   - if [[ "${SPEC}" = "linux-g++-64" && "${CONFIG}" = "installer" ]]; then
-        deploy/create_linux_appimage.sh ${TRAVIS_BUILD_DIR} ${SHADOW_BUILD_DIR}/release ${SHADOW_BUILD_DIR}/release/package;
+        ./deploy/create_linux_appimage.sh ${TRAVIS_BUILD_DIR} ${SHADOW_BUILD_DIR}/release ${SHADOW_BUILD_DIR}/release/package;
     fi
 
 deploy:
@@ -219,7 +220,7 @@ deploy:
       all_branches: true
       condition: $CONFIG = installer
 
-  # deploy installers to s3 latest/ if on a tag
+  # deploy tagged installers to s3 latest/
   - provider: s3
     access_key_id: AKIAIVORNALE7NHD3T6Q
     secret_access_key:
@@ -241,7 +242,7 @@ deploy:
       secure: BsLXeXUPsCJdX4tawrDnO8OFK5Hk4kzlDTiyH93En6TbjUargVAWDMcHVj7TUhr7+3Tao1W1zb0G4SJe9kHv+jrky0yE72KvoG3YAON0VXWKizxBAKkgHE2RxSTNAwDeKbi2G6YJfNDescBBfX7zEohShdXglQu7CGaUQKRaiI4=
     bucket: qgroundcontrol
     local_dir: ${SHADOW_BUILD_DIR}/release/package
-    upload-dir: builds/${TRAVIS_BRANCH}
+    upload-dir: ${TRAVIS_BRANCH}
     acl: public_read
     region: us-west-2
     skip_cleanup: true
-- 
2.22.0