Bimba.git

commit ead57a14f5fdd23da994c20304bdce1ca9010f26

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

improve release script

 release.sh | 15 +++++++++++----


diff --git a/release.sh b/release.sh
index 2929171a1ce309602ad7733a1b8914e677fa95fe..aa6d0ce73903de6cd4504626e025f7fdbcfd2fc2 100755
--- a/release.sh
+++ b/release.sh
@@ -98,7 +98,11 @@ 	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
 		echo "not all languages have changelog"
-		exit 1
+		echo "OK? [y/N]"
+		read -r yn
+		if [ "$yn" != 'y' ] && [ "$yn" != 'Y' ]; then
+			exit 1
+		fi
 	fi
 	git add app/build.gradle
 	git add metadata/
@@ -107,11 +111,14 @@ 	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 'push to master? [y/N]'
+	read -r yn
+	if [ "$yn" != 'y' ] && [ "$yn" != 'Y' ]; then
+		exit 1
+	fi
 	echo 'pushing …'
 	git push
-	echo 'tag and push tag?'
+	echo 'tag and push tag? [y/N]'
 	read -r yn
 	if [ "$yn" != 'y' ] && [ "$yn" != 'Y' ]; then
 		exit 1