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/code.angularjs.org/README.md    | 5 ++---
 scripts/code.angularjs.org/publish.sh   | 9 +++------
 scripts/jenkins/bump-increment.sh       | 4 ++--
 scripts/jenkins/bump-remove-snapshot.sh | 4 ++--
 4 files changed, 9 insertions(+), 13 deletions(-)

(limited to 'scripts')

diff --git a/scripts/code.angularjs.org/README.md b/scripts/code.angularjs.org/README.md
index fd034102..e3887004 100644
--- a/scripts/code.angularjs.org/README.md
+++ b/scripts/code.angularjs.org/README.md
@@ -2,9 +2,8 @@
 
 Script for updating code.angularjs.org repo from current local build.
 
-Requires `node` (for parsing `bower.json`)
-
-Note: This should only be run for a release build, not a snapshot build!
+Note: For a snapshot build, this will fetch the data from the ci server
+and NOT take the local build!
 
 ## Instructions
 
diff --git a/scripts/code.angularjs.org/publish.sh b/scripts/code.angularjs.org/publish.sh
index a23f613f..352ac10b 100755
--- a/scripts/code.angularjs.org/publish.sh
+++ b/scripts/code.angularjs.org/publish.sh
@@ -9,12 +9,9 @@ set -xe
 # Normalize working dir to script dir
 cd `dirname $0`
 
-
-# export so that node.js can read those env settings
-export TMP_DIR=../../tmp
-export REPO_DIR=$TMP_DIR/code.angularjs.org
-export BUILD_DIR=../../build
-
+TMP_DIR=../../tmp
+REPO_DIR=$TMP_DIR/code.angularjs.org
+BUILD_DIR=../../build
 SCRIPT_DIR=`pwd`
 NEW_VERSION=`cat $BUILD_DIR/version.txt`
 
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