diff --git a/release-prepare.sh b/release-prepare.sh index b0c1be750e8921e40e7843ebb648cabac9ca4698..705f420f0355b9f41f8a2699587d28e9056ce42e 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