diff --git a/scripts/release.sh b/scripts/release.sh index 0ad55a261163f223e9d86cf7514ae1909737749f..32e8a6ecbdba07473087481a3cc454c6f6a4d32d 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -108,6 +108,12 @@ echo "----------------------------------" echo "- Executing git push, with tag: v$2" echo "----------------------------------" + +description="$4" +if [[ "_$description" == "_" ]]; then + description="Release v$2" +fi + # Commit cd ${PROJECT_DIR} git reset HEAD @@ -115,7 +121,9 @@ git add package.json config.xml install.sh www/js/config.js www/manifest.json if [[ $? -ne 0 ]]; then exit 1 fi -git commit -m "v$2" && git tag -f "v$2" && git push +git commit -m "v$2" +git tag -f -a "v$2" -m "${description}" +git push origin "v$2" if [[ $? -ne 0 ]]; then exit 1 fi @@ -136,10 +144,6 @@ echo "**********************************" echo " Waiting 40s, for propagation to github..." sleep 40s -description="$4" -if [[ "_$description" == "_" ]]; then - description="Release v$2" -fi ./github.sh $1 ''"$description"'' if [[ $? -ne 0 ]]; then