From 40db15723310f5250d9728c56a18cf00777ca12e Mon Sep 17 00:00:00 2001
From: Norwin Roosen <github@nroo.de>
Date: Fri, 29 Mar 2019 18:57:43 +0100
Subject: [PATCH] fix travis fdroid deploy

---
 .travis.yml            | 20 ++++++++++++++------
 tools/deploy-fdroid.sh |  2 +-
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8587bbf..388027e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,14 +1,22 @@
 language: android
-node_js:
-- "8"
 
-before_script:
-- npm install
+android:
+  components:
+    - tools
+    - platform-tools
+    - build-tools-27.0.3
+    - android-27
+
+before_install:
+- yes | sdkmanager "platforms;android-27"
+
+install:
+- nvm install 8
 - npm install -g ionic cordova
+- npm install
 
 script:
-- npm run build
-- npm run android:build
+- npm run android:build # implies web build in www/ dir
 
 deploy:
   # deploy web build to gh-pages branch
diff --git a/tools/deploy-fdroid.sh b/tools/deploy-fdroid.sh
index 300015b..5bd60f5 100644
--- a/tools/deploy-fdroid.sh
+++ b/tools/deploy-fdroid.sh
@@ -4,7 +4,7 @@
 target=https://$GITHUB_TOKEN@github.com/sensebox/blockly-app.git
 branch=fdroid
 
-git clone --depth=1 -b $target $repo fdroid
+git clone --depth=1 -b $branch $target fdroid
 rm -rf fdroid/*
 mv -f platforms/android fdroid/
 cd fdroid