diff --git a/release-prepare.sh b/release-prepare.sh index 25fa02fd2ebd97c73427387c215e932ac28aa2c2..0c22c700b7d972bf3b24c2e5bc0be82c2e35dd3f 100755 --- a/release-prepare.sh +++ b/release-prepare.sh @@ -15,6 +15,7 @@ fi RELEASE=$1 SNAPSHOT=$2 +ROCKSPEC_REVISION=1 checkIsMaster() { @@ -56,7 +57,7 @@ renameRockSpecs() stageRockSpecs() { - # Acrescenta os removidos + # Acrescenta os removidos git status | grep "deleted" | awk '{print "git add "$2}' | sh - # Acrescenta os novos git add *.rockspec @@ -66,13 +67,14 @@ stageRockSpecs() releaseVersion() { echo "[..] release version $RELEASE..." - changeRockSpecs $RELEASE - renameRockSpecs $RELEASE + newVersion="$RELEASE-$ROCKSPEC_REVISION" + changeRockSpecs $newVersion + renameRockSpecs $newVersion stageRockSpecs git commit -m "[sgarest-daemon release] prepare release $RELEASE" && \ git tag -a $RELEASE -m "Release version $RELEASE." && \ git push --follow-tags && \ - echo "[ok]" + echo "[ok]" } nextSnapshotVersion() @@ -87,9 +89,10 @@ nextSnapshotVersion() } checkIsMaster -releaseVersion -nextSnapshotVersion +releaseVersion +nextSnapshotVersion echo "Success". exit 0; +