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 @@ - + Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de>, based on work by JOLLO NET NA 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 @@ - + 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"" '/[^<]\+ 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 +asciiblaster v1.0.6 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 @@ - + 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 @@ -asciiblaster v1.0.5 +asciiblaster v1.0.6