kivy build: test and document that make_locale is to be run first

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

contrib/make_packages

@@ -1,10 +1,10 @@
 #!/bin/bash
 
-contrib=$(dirname "$0")
+CONTRIB="$(dirname "$0")"
-test -n "$contrib" -a -d "$contrib" || exit
+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
 

contrib/make_tgz

@@ -7,18 +7,18 @@ ROOT_FOLDER="$CONTRIB"/..
 PACKAGES="$ROOT_FOLDER"/packages/
 LOCALE="$ROOT_FOLDER"/electrum/locale/
 
-(
+if [ ! -d "$LOCALE" ]; then
-    cd "$ROOT_FOLDER"
+  echo "Run make_locale first!"
+  exit 1
+fi
 
-    if [ ! -d "$LOCALE" ]; then
+if [ ! -d "$PACKAGES" ]; then
-      echo "Run make_locale first!"
+  echo "Run make_packages first!"
-      exit 1
+  exit 1
-    fi
+fi
 
-    if [ ! -d "$PACKAGES" ]; then
+(
-      echo "Run make_packages first!"
+    cd "$ROOT_FOLDER"
-      exit 1
-    fi
 
     echo "'git clean -fx' would delete the following files: >>>"
     git clean -fx --dry-run

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 \