From 8343cc2c1c4e55d4cabb9b3d391cef64a8bda2ed Mon Sep 17 00:00:00 2001
From: Akinwale Ariwodola <akinwale@gmail.com>
Date: Wed, 9 May 2018 17:55:47 +0100
Subject: [PATCH] travis release tweaks

---
 .travis.yml | 4 +---
 release.sh  | 3 ++-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index df40853e..2ebc3616 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -43,9 +43,7 @@ install:
 - mkdir -p ~/.buildozer/android/platform/android-sdk-23/licenses
 - echo $'\nd56f5187479451eabf01fb78af6dfcb131a6481e' > ~/.buildozer/android/platform/android-sdk-23/licenses/android-sdk-license
 script:
-- "./release.sh | grep -Fv -e 'working:' -e 'copy' --line-buffered"
-- export BUILD_VERSION=$(cat src/main/python/main.py | grep --color=never -oP '([0-9]+\.?)+')
-after_script:
+- "source ./release.sh | grep -Fv -e 'working:' -e 'copy' --line-buffered"
 - "echo Build Version: $BUILD_VERSION"
 deploy:
   provider: releases
diff --git a/release.sh b/release.sh
index 6e5ce68c..ecc651ad 100755
--- a/release.sh
+++ b/release.sh
@@ -3,6 +3,7 @@ cd app
 react-native bundle --platform android --dev false --entry-file src/index.js --bundle-output ../src/main/assets/index.android.bundle --assets-dest ../src/main/res/
 cd ..
 version=$(cat src/main/python/main.py | grep --color=never -oP '([0-9]+\.?)+')
+export BUILD_VERSION=$version
 buildozer android release
 jarsigner -verbose -sigalg SHA1withRSA \
     -digestalg SHA1 \
@@ -10,7 +11,7 @@ jarsigner -verbose -sigalg SHA1withRSA \
     -storepass $KEYSTORE_PASSWORD \
     bin/browser-$version-release-unsigned.apk lbry-android \
     && mv bin/browser-$version-release-unsigned.apk bin/browser-$version-release-signed.apk
-~/Dev/SDKs/android/build-tools/26.0.2/zipalign -v 4 \
+~/.buildozer/platform//SDKs/android/build-tools/26.0.1/zipalign -v 4 \
     bin/browser-$version-release-signed.apk bin/browser-$version-release.apk \
     && rm bin/browser-$version-release-signed.apk