From ba08b2279ddbdbe9bdd8fec349fa159e0b8cd147 Mon Sep 17 00:00:00 2001
From: SomberNight <somber.night@protonmail.com>
Date: Thu, 7 Feb 2019 16:45:09 +0100
Subject: [PATCH] kivy build: test and document that make_locale is to be run
 first

---
 contrib/make_apk            | 17 +++++++++++++++++
 contrib/make_packages       |  8 ++++----
 contrib/make_tgz            | 20 ++++++++++----------
 electrum/gui/kivy/Readme.md | 12 +++++++++---
 4 files changed, 40 insertions(+), 17 deletions(-)

diff --git a/contrib/make_apk b/contrib/make_apk
index 6940222cd..f6d691876 100755
--- a/contrib/make_apk
+++ b/contrib/make_apk
@@ -1,5 +1,22 @@
 #!/bin/bash
 
+set -e
+
+CONTRIB="$(dirname "$(readlink -e "$0")")"
+ROOT_FOLDER="$CONTRIB"/..
+PACKAGES="$ROOT_FOLDER"/packages/
+LOCALE="$ROOT_FOLDER"/electrum/locale/
+
+if [ ! -d "$LOCALE" ]; then
+  echo "Run make_locale first!"
+  exit 1
+fi
+
+if [ ! -d "$PACKAGES" ]; then
+  echo "Run make_packages first!"
+  exit 1
+fi
+
 pushd ./electrum/gui/kivy/
 
 make theming
diff --git a/contrib/make_packages b/contrib/make_packages
index 0e4ac67b1..56098d337 100755
--- a/contrib/make_packages
+++ b/contrib/make_packages
@@ -1,10 +1,10 @@
 #!/bin/bash
 
-contrib=$(dirname "$0")
-test -n "$contrib" -a -d "$contrib" || exit
+CONTRIB="$(dirname "$0")"
+test -n "$CONTRIB" -a -d "$CONTRIB" || exit
 
-rm "$contrib"/../packages/ -r
+rm "$CONTRIB"/../packages/ -r
 
 #Install pure python modules in electrum directory
-python3 -m pip install -r $contrib/deterministic-build/requirements.txt -t $contrib/../packages
+python3 -m pip install -r "$CONTRIB"/deterministic-build/requirements.txt -t "$CONTRIB"/../packages
 
diff --git a/contrib/make_tgz b/contrib/make_tgz
index 5110cef3b..a5a3373d9 100755
--- a/contrib/make_tgz
+++ b/contrib/make_tgz
@@ -7,19 +7,19 @@ ROOT_FOLDER="$CONTRIB"/..
 PACKAGES="$ROOT_FOLDER"/packages/
 LOCALE="$ROOT_FOLDER"/electrum/locale/
 
+if [ ! -d "$LOCALE" ]; then
+  echo "Run make_locale first!"
+  exit 1
+fi
+
+if [ ! -d "$PACKAGES" ]; then
+  echo "Run make_packages first!"
+  exit 1
+fi
+
 (
     cd "$ROOT_FOLDER"
 
-    if [ ! -d "$LOCALE" ]; then
-      echo "Run make_locale first!"
-      exit 1
-    fi
-
-    if [ ! -d "$PACKAGES" ]; then
-      echo "Run make_packages first!"
-      exit 1
-    fi
-
     echo "'git clean -fx' would delete the following files: >>>"
     git clean -fx --dry-run
     echo "<<<"
diff --git a/electrum/gui/kivy/Readme.md b/electrum/gui/kivy/Readme.md
index edf6b9e2a..85e54494e 100644
--- a/electrum/gui/kivy/Readme.md
+++ b/electrum/gui/kivy/Readme.md
@@ -24,13 +24,19 @@ folder.
     $ sudo docker build -t electrum-android-builder-img electrum/gui/kivy/tools
     ```
 
-3. Prepare pure python dependencies
+3. Build locale files
 
     ```
-    $ sudo ./contrib/make_packages
+    $ ./contrib/make_locale
     ```
 
-4. Build binaries
+4. Prepare pure python dependencies
+
+    ```
+    $ ./contrib/make_packages
+    ```
+
+5. Build binaries
 
     ```
     $ sudo docker run -it --rm \