From 69f48750f1f2a2619ad7e0271ca3d3f3731cdbf8 Mon Sep 17 00:00:00 2001
From: Odweta <code.62rdl@aleeas.com>
Date: Tue, 31 Dec 2024 17:27:59 +0100
Subject: [PATCH] update deploy script

---
 deploy.sh | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/deploy.sh b/deploy.sh
index 2839835..b1883aa 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -1,30 +1,31 @@
 #!/bin/bash
 
-echo -n "glpat: "
+echo -n "[glpat]: "
 read glpat
 
-echo -n "keystore password: "
+echo -n "[keystore password]: "
 read ks_pass
 
 cd ./mobile
 
-ver=$(./gradlew printVersionName -q)
-
-# build
-./gradlew assembleRelease
-
-# sign
-~/Android/Sdk/build-tools/35.0.0/apksigner sign --alignment-preserved --ks ~/Documents/android-keystore.jks --ks-pass pass:$ks_pass app/build/outputs/apk/release/com.odweta.solon_$ver.apk
-
-exit
-
 # add, commit, push
+echo "\n[add, commit, push]\n"
 git add ..
 git commit -m "made new release $ver"
 git push
 
+ver=$(./gradlew printVersionName -q)
+
+# build
+echo "\n[building]\n"
+./gradlew assembleRelease
+
+# sign
+echo "\n[signing]\n"
+~/Android/Sdk/build-tools/35.0.0/apksigner sign --alignment-preserved --ks ~/Documents/android-keystore.jks --ks-pass pass:$ks_pass app/build/outputs/apk/release/com.odweta.solon_$ver.apk
+
 # create the tag
-echo "\n[creating tag v$ver]"
+echo "\n[creating tag v$ver]\n"
 data_str='{ "tag_name": "'$ver'", "ref": "HEAD", "message": "Tagging release v'$ver'" }'
 curl --request POST \
     --header "PRIVATE-TOKEN: $glpat" \
@@ -33,7 +34,7 @@ curl --request POST \
     "https://gitlab.com/api/v4/projects/47146187/repository/tags"
 
 # make a release
-echo "\n[publishing release $ver]"
+echo "\n[publishing release $ver]\n"
 data_str='{ "name": "v'$ver'", "tag_name": "'$ver'", "ref": "HEAD" }'
 curl --request POST \
     --header "PRIVATE-TOKEN: $glpat" \
@@ -42,14 +43,14 @@ curl --request POST \
     "https://gitlab.com/api/v4/projects/47146187/releases"
 
 # attach a file
-echo "\n[attaching the release apk]"
+echo "\n[attaching the release apk]\n"
 asset_url="https://gitlab.com/-/project/47146187"$(curl --request POST \
     --header "PRIVATE-TOKEN: $glpat" \
     --form "file=@app/build/outputs/apk/release/com.odweta.solon_$ver.apk" \
     "https://gitlab.com/api/v4/projects/47146187/uploads" | jq .url -r)
 
 # add the file as a stable release asset
-echo "\n[creating release asset]"
+echo "\n[creating release asset]\n"
 curl --request POST \
     --header "PRIVATE-TOKEN: $glpat" \
     --data name="app-release.apk" \