From 2ca7884bbe11859ce57a2137fd9ebefef5a33285 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Fri, 11 Jun 2021 00:36:40 +0200 Subject: [PATCH] Fix bump releases Closes https://git.autonomic.zone/coop-cloud/abra/issues/180. --- abra | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/abra b/abra index c2768f8..46e0be0 100755 --- a/abra +++ b/abra @@ -2218,7 +2218,7 @@ sub_recipe_release() { success "All compose files updated; new version is $new_version" - if [ "$abra___no_prompt" = "false" ]; then + if [ "$abra___no_prompt" = "false" ] && [ "$bump" = "false" ]; then read -rp "Commit your changes to git? [y/N]? " choice if [ "${choice,,}" != "y" ]; then @@ -2226,7 +2226,7 @@ sub_recipe_release() { fi fi - if [ "$abra___no_prompt" = "false" ]; then + if [ "$abra___no_prompt" = "false" ] && [ "$bump" = "false" ]; then git commit -avem "Version $new_version; sync labels" || exit else git commit -am "Version $new_version; sync labels" || true @@ -2255,7 +2255,7 @@ sub_recipe_release() { if [ "$abra___no_prompt" = "false" ]; then read -rp "Git push this new tag? [y/N]? " choice - if [ "${choice,,}" != "y" ]; then + if [ "${choice,,}" = "y" ]; then git push && git push --tags fi else