From 3814aba9b452a76e163a8f4e040ecee159727270 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz?=
 <lucio@lucioillanes.de>
Date: Fri, 23 Nov 2018 21:27:35 +0100
Subject: [PATCH] Bump to v1.0.6.

---
 asciiblaster-cordoba/config.xml               |  2 +-
 asciiblaster-cordoba/package-lock.json        |  2 +-
 asciiblaster-cordoba/package.json             |  2 +-
 .../android/app/src/main/AndroidManifest.xml  |  2 +-
 .../assets/www/assets/shell/bump-version.sh   | 28 ++++++++++++-------
 .../app/src/main/assets/www/index.html        |  2 +-
 .../android/app/src/main/res/xml/config.xml   |  2 +-
 asciiblaster-nw/package-lock.json             |  2 +-
 asciiblaster-nw/package.json                  |  2 +-
 index.html                                    |  2 +-
 10 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/asciiblaster-cordoba/config.xml b/asciiblaster-cordoba/config.xml
index dde5f94..d2481e4 100644
--- a/asciiblaster-cordoba/config.xml
+++ b/asciiblaster-cordoba/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="com.lalbornoz.asciiblaster" version="1.0.5" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="com.lalbornoz.asciiblaster" version="1.0.6" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <author email="lucio@lucioillanes.de" href="https://github.com/lalbornoz/asciiblaster#readme">
         Lucio Andrés Illanes Albornoz &lt;lucio@lucioillanes.de&gt;, based on work by JOLLO NET NA
     </author>
diff --git a/asciiblaster-cordoba/package-lock.json b/asciiblaster-cordoba/package-lock.json
index 9af73a6..f7603d4 100644
--- a/asciiblaster-cordoba/package-lock.json
+++ b/asciiblaster-cordoba/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "asciiblaster-cordoba",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/asciiblaster-cordoba/package.json b/asciiblaster-cordoba/package.json
index 2fb59d0..609bdd7 100644
--- a/asciiblaster-cordoba/package.json
+++ b/asciiblaster-cordoba/package.json
@@ -30,5 +30,5 @@
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
-  "version": "1.0.5"
+  "version": "1.0.6"
 }
diff --git a/asciiblaster-cordoba/platforms/android/app/src/main/AndroidManifest.xml b/asciiblaster-cordoba/platforms/android/app/src/main/AndroidManifest.xml
index 30ee8ef..7968774 100644
--- a/asciiblaster-cordoba/platforms/android/app/src/main/AndroidManifest.xml
+++ b/asciiblaster-cordoba/platforms/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<manifest android:hardwareAccelerated="true" android:versionCode="10003" android:versionName="1.0.3" package="com.lalbornoz.asciiblaster" xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest android:hardwareAccelerated="true" android:versionCode="10006" android:versionName="1.0.6" package="com.lalbornoz.asciiblaster" xmlns:android="http://schemas.android.com/apk/res/android">
     <supports-screens android:anyDensity="true" android:largeScreens="true" android:normalScreens="true" android:resizeable="true" android:smallScreens="true" android:xlargeScreens="true" />
     <uses-permission android:name="android.permission.INTERNET" />
     <application android:hardwareAccelerated="true" android:icon="@mipmap/icon" android:label="@string/app_name" android:supportsRtl="true">
diff --git a/asciiblaster-cordoba/platforms/android/app/src/main/assets/www/assets/shell/bump-version.sh b/asciiblaster-cordoba/platforms/android/app/src/main/assets/www/assets/shell/bump-version.sh
index 73ef94a..c0e1147 100755
--- a/asciiblaster-cordoba/platforms/android/app/src/main/assets/www/assets/shell/bump-version.sh
+++ b/asciiblaster-cordoba/platforms/android/app/src/main/assets/www/assets/shell/bump-version.sh
@@ -15,7 +15,7 @@ usage() {
 };
 
 main() {
-	local _opt="" _version_new="" _version_old="";
+	local _opt="" _version_new="" _version_new_code="" _version_old="";
 	while getopts hv _opt; do
 	case "${_opt}" in
 	h) usage; exit 0; ;;
@@ -28,6 +28,7 @@ main() {
 		echo "error: empty or missing new version number argument" >&2; usage; exit 1;
 	else
 		_version_old="${1}"; _version_new="${2}";
+		_version_new_code="$(echo "${_version_new}" | sed -e 's,\.,,g' -e 's/^[0-9]/&00/')";
 	fi;
 	for _cmd in ${RELEASE_DEPS_CMD}; do
 		if ! which "${_cmd}" >/dev/null; then
@@ -35,17 +36,24 @@ main() {
 			exit 1;
 		fi;
 	done;
-	rc sed -i"" '/"version":/s/\("version":\s*\)"'"${_version_old}"'"/\1"'"${_version_new}"'"/'		\
-		asciiblaster-cordoba/package.json								\
-		asciiblaster-cordoba/package-lock.json								\
-		asciiblaster-nw/package.json									\
-		asciiblaster-nw/package-lock.json;
-	rc sed -i"" '/version="/s/\(version=\)"'"${_version_old}"'"/\1"'"${_version_new}"'"/'			\
+	rc sed -i"" '/version="/s/\(version=\)"'"${_version_old}"'"/\1"'"${_version_new}"'"/'				\
 		asciiblaster-cordoba/config.xml;
-	rc sed -i"" '/<title>[^<]\+ v/s/\(<title>[^<]\+ v\)'"${_version_old}"'\(<\)/\1'"${_version_new}"'\2/'	\
+	rc sed -i"" '/"version":/s/\("version":\s*\)"'"${_version_old}"'"/\1"'"${_version_new}"'"/'			\
+		asciiblaster-cordoba/package.json									\
+		asciiblaster-cordoba/package-lock.json;
+	rc sed -i"" '/android:versionCode="/s/\(android:versionCode=\)"[0-9]\+"/\1"'"${_version_new_code}"'"/'		\
+		asciiblaster-cordoba/platforms/android/app/src/main/AndroidManifest.xml;
+	rc sed -i"" '/android:versionName="/s/\(android:versionName=\)"'"${_version_old}"'"/\1"'"${_version_new}"'"/'	\
+		asciiblaster-cordoba/platforms/android/app/src/main/AndroidManifest.xml;
+	rc sed -i"" '/version="/s/\(version=\)"'"${_version_old}"'"/\1"'"${_version_new}"'"/'				\
+		asciiblaster-cordoba/platforms/android/app/src/main/res/xml/config.xml;
+	rc sed -i"" '/"version":/s/\("version":\s*\)"'"${_version_old}"'"/\1"'"${_version_new}"'"/'			\
+		asciiblaster-nw/package.json										\
+		asciiblaster-nw/package-lock.json;
+	rc sed -i"" '/<title>[^<]\+ v/s/\(<title>[^<]\+ v\)'"${_version_old}"'\(<\)/\1'"${_version_new}"'\2/'		\
 		index.html;
-	rc rsync -aiLPv --delete										\
-		asciiblaster-cordoba/www/									\
+	rc rsync -aiLPv --delete											\
+		asciiblaster-cordoba/www/										\
 		asciiblaster-cordoba/platforms/android/app/src/main/assets/www/;
 	rc git add asciiblaster-cordoba/platforms/android/app/src/main/assets/www;
 	rc git commit -avm "Bump to v${_version_new}.";
diff --git a/asciiblaster-cordoba/platforms/android/app/src/main/assets/www/index.html b/asciiblaster-cordoba/platforms/android/app/src/main/assets/www/index.html
index 0350661..6fcb175 100644
--- a/asciiblaster-cordoba/platforms/android/app/src/main/assets/www/index.html
+++ b/asciiblaster-cordoba/platforms/android/app/src/main/assets/www/index.html
@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>asciiblaster v1.0.5</title>
+<title>asciiblaster v1.0.6</title>
 <meta name="viewport" content="width=device-width, maximum-scale=1.0, user-scalable=yes" />
 <link rel="stylesheet" href="assets/css/sally.css" type="text/css" charset="utf-8" />
 <link rel="stylesheet" href="assets/css/ak.css" type="text/css" charset="utf-8" />
diff --git a/asciiblaster-cordoba/platforms/android/app/src/main/res/xml/config.xml b/asciiblaster-cordoba/platforms/android/app/src/main/res/xml/config.xml
index 65496a6..d03f57c 100644
--- a/asciiblaster-cordoba/platforms/android/app/src/main/res/xml/config.xml
+++ b/asciiblaster-cordoba/platforms/android/app/src/main/res/xml/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="com.lalbornoz.asciiblaster" version="1.0.3" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="com.lalbornoz.asciiblaster" version="1.0.6" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <feature name="Whitelist">
         <param name="android-package" value="org.apache.cordova.whitelist.WhitelistPlugin" />
         <param name="onload" value="true" />
diff --git a/asciiblaster-nw/package-lock.json b/asciiblaster-nw/package-lock.json
index 1da8d3c..96cc879 100644
--- a/asciiblaster-nw/package-lock.json
+++ b/asciiblaster-nw/package-lock.json
@@ -1,5 +1,5 @@
 {
   "name": "asciiblaster",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "lockfileVersion": 1
 }
diff --git a/asciiblaster-nw/package.json b/asciiblaster-nw/package.json
index abaac76..67e9433 100644
--- a/asciiblaster-nw/package.json
+++ b/asciiblaster-nw/package.json
@@ -18,7 +18,7 @@
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
-  "version": "1.0.5",
+  "version": "1.0.6",
   "window": {
     "title": "asciiblaster (standalone NW app)",
     "toolbar": true,
diff --git a/index.html b/index.html
index 0350661..6fcb175 100644
--- a/index.html
+++ b/index.html
@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>asciiblaster v1.0.5</title>
+<title>asciiblaster v1.0.6</title>
 <meta name="viewport" content="width=device-width, maximum-scale=1.0, user-scalable=yes" />
 <link rel="stylesheet" href="assets/css/sally.css" type="text/css" charset="utf-8" />
 <link rel="stylesheet" href="assets/css/ak.css" type="text/css" charset="utf-8" />