From 243a0e3cf1f3953b2c6c9796fe739613153e191e Mon Sep 17 00:00:00 2001
From: SomberNight <somber.night@protonmail.com>
Date: Tue, 27 Nov 2018 21:35:26 +0100
Subject: [PATCH] android docker: make_apk optionally takes "release" as arg

---
 contrib/make_apk                 |  2 ++
 electrum/gui/kivy/Readme.md      | 16 +++++++++++-----
 electrum/gui/kivy/tools/build.sh |  9 ---------
 3 files changed, 13 insertions(+), 14 deletions(-)
 delete mode 100755 electrum/gui/kivy/tools/build.sh

diff --git a/contrib/make_apk b/contrib/make_apk
index 773aeab54..6940222cd 100755
--- a/contrib/make_apk
+++ b/contrib/make_apk
@@ -2,6 +2,8 @@
 
 pushd ./electrum/gui/kivy/
 
+make theming
+
 if [[ -n "$1"  && "$1" == "release" ]] ; then
     echo -n Keystore Password:
     read -s password
diff --git a/electrum/gui/kivy/Readme.md b/electrum/gui/kivy/Readme.md
index 83bc01a36..f394ddf13 100644
--- a/electrum/gui/kivy/Readme.md
+++ b/electrum/gui/kivy/Readme.md
@@ -24,22 +24,28 @@ folder.
     $ sudo docker build -t electrum-android-builder-img electrum/gui/kivy/tools
     ```
 
-3. Build binaries
+3. Prepare pure python dependencies
 
     ```
-    $ sudo docker run \
+    $ sudo ./contrib/make_packages
+    ```
+
+4. Build binaries
+
+    ```
+    $ sudo docker run -it --rm \
         --name electrum-android-builder-cont \
-        --rm \
         -v $PWD:/home/user/wspace/electrum \
+        -v ~/.keystore:/home/user/.keystore \
         --workdir /home/user/wspace/electrum \
         electrum-android-builder-img \
-        ./electrum/gui/kivy/tools/build.sh
+        ./contrib/make_apk
     ```
     This mounts the project dir inside the container,
     and so the modifications will affect it, e.g. `.buildozer` folder
     will be created.
 
-4. The generated binary is in `./bin`.
+5. The generated binary is in `./bin`.
 
 
 
diff --git a/electrum/gui/kivy/tools/build.sh b/electrum/gui/kivy/tools/build.sh
deleted file mode 100755
index fa8de30b7..000000000
--- a/electrum/gui/kivy/tools/build.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-
-pushd electrum/gui/kivy
-make theming
-popd
-
-sudo ./contrib/make_packages
-
-./contrib/make_apk