From 6093d2bddba05947074aba94627583a0f320c326 Mon Sep 17 00:00:00 2001 From: ardocrat Date: Thu, 6 Nov 2025 13:19:11 +0300 Subject: [PATCH] build: fix android version naming --- scripts/android.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/android.sh b/scripts/android.sh index 3459ea22..d01e539a 100755 --- a/scripts/android.sh +++ b/scripts/android.sh @@ -1,6 +1,6 @@ #!/bin/bash -usage="Usage: android.sh [type] [platform|version]\n - type: 'build', 'release'\n - platform, for 'build' type: 'v7', 'v8', 'x86'\n - optional version for 'release' (needed on MacOS), example: '0.2.2'" +usage="Usage: android.sh [type] [platform|version]\n - type: 'build', 'release'\n - platform, for 'build' type: 'v7', 'v8', 'x86'\n - version for 'release', example: '0.2.2'" case $1 in build|release) ;; @@ -81,10 +81,10 @@ function build_apk() { adb -s "$SERIAL" shell am start -n mw.gri.android/.MainActivity; done else - if [[ "$OSTYPE" != "darwin"* ]]; then - version=$(grep -m 1 -Po 'version = "\K[^"]*' Cargo.toml) - else - version=v$2 + # Get version + version=v$2 + if [[ -z "$version" ]]; then + version=$(grep -m 1 -Po 'version = "\K[^"]*' ../Cargo.toml) fi # Setup release file name name=grim-${version}-android-$1.apk