From cd60a3a754e4d8bbf960289493972184eef62087 Mon Sep 17 00:00:00 2001
From: Carlos Viana <cviana@tecgraf.puc-rio.br>
Date: Wed, 8 Apr 2020 14:43:43 -0300
Subject: [PATCH] =?UTF-8?q?Ajustando=20o=20release-prepare=20que=20estava?=
 =?UTF-8?q?=20falhando=20na=20compara=C3=A7=C3=A3o=20do=20branch=20corrent?=
 =?UTF-8?q?e=20com=20o=20branch=20master.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[SOMA-3699]
---
 release-prepare.sh | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/release-prepare.sh b/release-prepare.sh
index b0c1be7..705f420 100755
--- a/release-prepare.sh
+++ b/release-prepare.sh
@@ -19,8 +19,10 @@ SNAPSHOT=$2
 checkIsMaster()
 {
    res=$(git rev-parse --abbrev-ref HEAD)
-   echo "RES: $res"
-   [ ! "$res" == "master" ] && { echo "[Error] Tag can only be generated from master!"; exit -1; }
+   if [[ "$res" != "master" ]]; then
+      echo "[Error] Tag can only be generated from master!"
+      exit -1  
+   fi
 }
 
 changeVersion()
@@ -55,10 +57,9 @@ renameRockSpecs()
 stageRockSpecs()
 {
 	# Acrescenta os removidos
-	git st | grep "deleted" | awk '{print "git add "$2}' | sh -
-	
-	# Acrescenta os novos
-	git add *.rockspec
+   git st | grep "deleted" | awk '{print "git add "$2}' | sh -
+   # Acrescenta os novos
+   git add *.rockspec
 }
 
 
@@ -67,7 +68,6 @@ releaseVersion()
    echo "[..] release version $RELEASE..."
    changeRockSpecs $RELEASE
    renameRockSpecs $RELEASE
-
 	stageRockSpecs
    git commit -m "[sgarest-daemon release] prepare release $RELEASE" && \
    git tag -a $RELEASE -m "Release version $RELEASE." && \
@@ -80,14 +80,13 @@ nextSnapshotVersion()
    echo "[..] prepare for next development $SNAPSHOT..."
    changeRockSpecs $SNAPSHOT
    renameRockSpecs $SNAPSHOT
-
    stageRockSpecs
    git commit -m "[sgarest-daemon release] prepare for next development $SNAPSHOT" && \
    git push && \
    echo "[ok]"
 }
 
-#checkIsMaster
+checkIsMaster
 releaseVersion 
 nextSnapshotVersion 
 
-- 
GitLab