From 0b5649be9885c238cb75360ad40ced566eadfbf0 Mon Sep 17 00:00:00 2001
From: Felix Ableitner <me@nutomic.com>
Date: Sun, 8 Oct 2017 15:27:09 +0900
Subject: [PATCH] Fix publish script and Travis build

---
 .travis.yml                  |  4 ++--
 publish-release.sh           | 15 +++++++--------
 src/main/play/en-GB/whatsnew | 15 ++++++++-------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d88f344d..1e050d81 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,9 +7,9 @@ android:
   components:
     - tools
     - android-26
-    - build-tools-26.0.1
+    - build-tools-26.0.2
     - platform-tools
-    - build-tools-26.0.1
+    - build-tools-26.0.2
     - android-26
     - extra-android-m2repository
 
diff --git a/publish-release.sh b/publish-release.sh
index 50e960a2..2dd56df5 100755
--- a/publish-release.sh
+++ b/publish-release.sh
@@ -25,13 +25,12 @@ echo "
 Enter Changelog for $version
 -----------------------------
 "
-changelog_file="/tmp/changelog.tmp"
-touch
-${DEFAULT_EDITOR} $changelog_file
+changelog_file="build/changelog.tmp"
+touch ${changelog_file}
+nano ${changelog_file}
 
-changelog=`cat $changelog_file`
-rm $changelog_file
-echo $changelog > "src/main/play/en-GB/whatsnew"
+changelog=`cat ${changelog_file}`
+mv ${changelog_file} "src/main/play/en-GB/whatsnew"
 
 echo "
 
@@ -39,12 +38,12 @@ Push to Google Play
 -----------------------------
 "
 
-read -p "Enter signing password: " password
+read -s -p "Enter signing password: " password
 
 SIGNING_PASSWORD=$password ./gradlew assembleRelease
 
 # Upload apk and listing to Google Play
-./gradlew publishRelease
+SIGNING_PASSWORD=$password ./gradlew publishRelease
 
 echo "
 
diff --git a/src/main/play/en-GB/whatsnew b/src/main/play/en-GB/whatsnew
index 79c4c47a..3d9db239 100644
--- a/src/main/play/en-GB/whatsnew
+++ b/src/main/play/en-GB/whatsnew
@@ -1,7 +1,8 @@
-- sort folders and devices (@nutomic)
-- change default compression to metadata only (@nutomic)
-- fixed chmod problem with syncthing binary (@zillode)
-- fixed dialog background on pre-Lollipop (@veniosg)
-- various design improvements (@veniosg)
-- imported translations
-- updated syncthing to v0.11.22
\ No newline at end of file
+- raise minimum Android version to ICS 4.0 (@nutomic)
+- fixed root related issues {@flipreverse)
+- lots of bug fixes, better working run conditions (@nutomic)
+- show button to open logs if Syncthing isn't loading (@nutomic)
+- added "edit ignores" button (@nutomic)
+- updated Syncthing to v0.14.39-rc.1
+- updated translations
+