From b3b9730c19e31bb1609367933fa3d73d213153df Mon Sep 17 00:00:00 2001
From: Sergii Pylypenko <x.pelya.x@gmail.com>
Date: Wed, 1 Nov 2017 17:42:27 +0200
Subject: [PATCH] SDL: helper scripts to uninstall/reinstall .apk

---
 .../jni/application/liero/AndroidAppSettings.cfg  |  6 +++---
 reinstall-apk.sh                                  | 14 --------------
 reinstallApk.sh                                   | 15 +++++++++++++++
 resetApkData.sh                                   |  5 +++++
 sign-upload.sh => signUpload.sh                   |  0
 uninstallApk.sh                                   |  5 +++++
 6 files changed, 28 insertions(+), 17 deletions(-)
 delete mode 100755 reinstall-apk.sh
 create mode 100755 reinstallApk.sh
 create mode 100755 resetApkData.sh
 rename sign-upload.sh => signUpload.sh (100%)
 create mode 100755 uninstallApk.sh

diff --git a/project/jni/application/liero/AndroidAppSettings.cfg b/project/jni/application/liero/AndroidAppSettings.cfg
index 2c7933399..130e17184 100644
--- a/project/jni/application/liero/AndroidAppSettings.cfg
+++ b/project/jni/application/liero/AndroidAppSettings.cfg
@@ -7,10 +7,10 @@ AppName="OpenLiero"
 AppFullName=open.liero.be
 
 # Application version code (integer)
-AppVersionCode=13702
+AppVersionCode=13703
 
 # Application user-visible version name (string)
-AppVersionName="1.37.02"
+AppVersionName="1.37.03"
 
 # Specify path to download application data in zip archive in the form 'Description|URL|MirrorURL^Description2|URL2|MirrorURL2^...'
 # If you'll start Description with '!' symbol it will be enabled by default, other downloads should be selected by user from startup config menu
@@ -255,7 +255,7 @@ APP_PLATFORM=android-21
 
 # Specify architectures to compile, 'all' or 'y' to compile for all architectures.
 # Available architectures: armeabi armeabi-v7a x86 mips arm64-v8a
-MultiABI='armeabi-v7a' # x86 arm64-v8a'
+MultiABI='armeabi-v7a x86 arm64-v8a'
 
 # Optional shared libraries to compile - removing some of them will save space
 # MP3 support by libMAD is encumbered by patents and libMAD is GPL-ed
diff --git a/reinstall-apk.sh b/reinstall-apk.sh
deleted file mode 100755
index 6434ba656..000000000
--- a/reinstall-apk.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-[ -z "$1" ] && { echo "Specify .apk file"; exit 1; }
-
-LOG=/tmp/reinstall-apk-$$.log
-
-adb install -r $1 | tee $LOG
-
-grep '^Failure' $LOG && {
-	adb uninstall `aapt dump badging $1 | grep 'package:' | sed "s/.*name='\([^']*\)'.*/\1/"`
-	adb install -r $1
-}
-
-rm -f $LOG
diff --git a/reinstallApk.sh b/reinstallApk.sh
new file mode 100755
index 000000000..85992eb14
--- /dev/null
+++ b/reinstallApk.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+APK="$1"
+[ -z "$APK" ] && APK=project/app/build/outputs/apk/app-release.apk
+
+LOG=/tmp/reinstall-apk-$$.log
+
+adb install -r "$APK" | tee $LOG
+
+grep '^Failure' $LOG && {
+	adb uninstall `aapt dump badging "$APK" | grep 'package:' | sed "s/.*name='\([^']*\)'.*/\1/"`
+	adb install -r "$APK"
+}
+
+rm -f $LOG
diff --git a/resetApkData.sh b/resetApkData.sh
new file mode 100755
index 000000000..81733f81c
--- /dev/null
+++ b/resetApkData.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+. ./AndroidAppSettings.cfg
+
+adb shell pm clear $AppFullName
diff --git a/sign-upload.sh b/signUpload.sh
similarity index 100%
rename from sign-upload.sh
rename to signUpload.sh
diff --git a/uninstallApk.sh b/uninstallApk.sh
new file mode 100755
index 000000000..9139d5404
--- /dev/null
+++ b/uninstallApk.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+. ./AndroidAppSettings.cfg
+
+adb uninstall $AppFullName