From 45af02de0457881f269b52d6c3f0ed58da53cfac Mon Sep 17 00:00:00 2001 From: Tobias Bosch Date: Mon, 16 Dec 2013 09:47:51 -0800 Subject: chore(build): simplify release scripts --- scripts/jenkins/bump-increment.sh | 4 ++-- scripts/jenkins/bump-remove-snapshot.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'scripts/jenkins') diff --git a/scripts/jenkins/bump-increment.sh b/scripts/jenkins/bump-increment.sh index 1a000fe0..5e8e4fc7 100755 --- a/scripts/jenkins/bump-increment.sh +++ b/scripts/jenkins/bump-increment.sh @@ -17,8 +17,8 @@ cd `dirname $0`/../.. echo "-- increment version " grunt bump:$BUMP_TYPE -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 +NEXT_VERSION=`sed -En 's/.*"version"[ ]*:[ ]*"(.*)".*/\1/p' package.json` +sed -i .tmp -E 's/"version": "(.*)"/"version": "\1-snapshot"/' package.json echo "-- new version: `grep '"version"' package.json`" echo "-- commit" git add package.json diff --git a/scripts/jenkins/bump-remove-snapshot.sh b/scripts/jenkins/bump-remove-snapshot.sh index cb1803cb..fb7c79b9 100755 --- a/scripts/jenkins/bump-remove-snapshot.sh +++ b/scripts/jenkins/bump-remove-snapshot.sh @@ -10,8 +10,8 @@ set -xe cd `dirname $0`/../.. echo "-- old version: `grep '"version"' package.json`" -sed -i .tmp -e 's/"version": "\(.*\)-snapshot"/"version": "\1"/' package.json -VERSION=$(node -e "console.log(require('./package.json').version)" | sed -e 's/\r//g') +sed -i .tmp -E 's/"version": "(.*)-snapshot"/"version": "\1"/' package.json +VERSION=`sed -En 's/.*"version"[ ]*:[ ]*"(.*)".*/\1/p' package.json` echo "-- local version: $VERSION" echo "-- commit and tag with v$VERSION" -- cgit v1.2.3