chore(build): fixes to release.sh

1 files changed, 20 insertions, 8 deletions

diff --git a/scripts/jenkins/release.sh b/scripts/jenkins/release.sh
index 88198d81..4bb3b076 100755
--- a/scripts/jenkins/release.sh
+++ b/scripts/jenkins/release.sh
@@ -1,23 +1,35 @@
 #!/bin/bash
 
+if [ -z "$1" ]; then
+    echo "Please specify the version bump type: patch|minor|major"
+    exit 1
+fi
+
 set -e # fail if any command fails
 cd `dirname $0`/../..
+BUMP_TYPE=$1
 
 # bump versions: remove "-snapshot" suffix
-sed -i -e 's/"version": "\(.*\)-snapshot"/"version": "\1"/' package.json
+sed -i .tmp -e 's/"version": "\(.*\)-snapshot"/"version": "\1"/' package.json
 
 # Build
-./jenkins_build.sh
-
+# ./jenkins_build.sh
+grunt package
 VERSION=`cat build/version.txt`
 
-# bump versions: increment version number and add "-snapshot" again
+# Commit and tag
+git add package.json
+git commit -m "chore(release): v$VERSION"
+git tag -m "v$VERSION" v$VERSION
+
+# bump versions: increment version number and add "-snapshot"
 grunt bump:$BUMP_TYPE
-sed -i -e 's/"version": "\(.*\)"/"version": "\1-snapshot"/' package.json
+NEXT_VERSION=$(node -e "console.log(require('./package.json').version)" | sed -e 's/\r//g')
+sed -i .tmp -e 's/"version": "\(.*\)"/"version": "\1-snapshot"/' package.json
+git add package.json
+git commit -m "chore(release): start v$NEXT_VERSION"
 
-# commit, tag and push
-git commit -m "chore(release): v%VERSION%"
-git tag -m "v%VERSION%" v%VERSION%
+# push to github
 # TODO git push
 
 # Update code.angularjs.org