Bimba.git

commit eebdb568d2d8a1fd2ec618b3234f46991bb60b24

Author: Adam Evyčędo <git@apiote.xyz>

another release script fixes

 release.sh | 6 ++++--


diff --git a/release.sh b/release.sh
index 3d8e82bbf0884ed1f50f229fd1afe6bc67c81556..76d0c0530391fe1a3d0cb63b0d404cd4e6135e95 100755
--- a/release.sh
+++ b/release.sh
@@ -93,7 +93,7 @@
 	echo "time to update changelogs"
 elif [ $phase -eq 1 ]
 then
-	newVersionName=$(grep 'versionName' app/build.gradle | tr -s ' ' | cut -d ' ' -f3 | tr -d '"')
+	newVersionName=$(grep -E 'versionName "[0-9\.]+"' app/build.gradle | tr -s ' ' | cut -d ' ' -f3 | tr -d '"')
 	newVersionCode=$(grep 'versionCode' app/build.gradle | tr -s ' ' | cut -d ' ' -f3)
 	if ! find metadata -type d -name changelogs -print0 | xargs -0 -I{} [ -f "{}/$newVersionCode.txt" ]
 	then
@@ -107,6 +107,8 @@ 	echo 'pushing …'
 	git push
 	git switch master
 	git merge -S --no-ff -m "merge develop into master for version $newVersionName" develop
+	echo 'push to master?'
+	read -r _
 	echo 'pushing …'
 	git push
 	echo 'tag and push tag?'
@@ -120,7 +122,7 @@ 	git switch develop
 	git merge master
 elif [ $phase -eq 2 ]
 then
-	newVersionName=$(grep 'versionName' app/build.gradle | tr -s ' ' | cut -d ' ' -f3 | tr -d '"')
+	newVersionName=$(grep -E 'versionName "[0-9\.]+"' app/build.gradle | tr -s ' ' | cut -d ' ' -f3 | tr -d '"')
 	git tag -s -m "v${newVersionName}" "v${newVersionName}"
 	git push origin --tags
 	git switch develop