From e45f385b3bc0e987c673f6e46316de128dd48eb2 Mon Sep 17 00:00:00 2001 From: Steve Birks Date: Wed, 25 Jan 2012 10:24:54 +0000 Subject: [PATCH 1/2] use sed to extract from the json and allow whitespace --- bin/usenode-release | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/usenode-release b/bin/usenode-release index 4982cac..c618786 100755 --- a/bin/usenode-release +++ b/bin/usenode-release @@ -16,7 +16,7 @@ if [ ! -r $PACKAGE ]; then exit 1 fi -UNCOMMITTED_CHANGES_CHECK=`cd $PROJECT; git st --porcelain` +UNCOMMITTED_CHANGES_CHECK=`cd $PROJECT; git status --porcelain` if [ "x$UNCOMMITTED_CHANGES_CHECK" != "x" ]; then echo "Error: There are uncommited changes" @@ -24,10 +24,10 @@ if [ "x$UNCOMMITTED_CHANGES_CHECK" != "x" ]; then exit 1 fi -PROJECT_NAME=`cat $PACKAGE | egrep '"name"' | awk -F \" '/([\d]*)/{ print $4}'` +PROJECT_NAME=`sed -ne 's/[ ,]//g; s/^"name":"\(.*\)"/\1/p' $PACKAGE` echo "Publishing '$PROJECT_NAME'." -CURRENT_VERSION=`cat $PACKAGE | egrep '"version"' | awk -F \" '/([\d]*)/{ print $4}'` +CURRENT_VERSION=`sed -ne 's/[ ,]//g; s/^"version":"\(.*\)"/\1/p' $PACKAGE` echo "Current version is $CURRENT_VERSION." if [ "x$NEW_VERSION" = "x" ]; then @@ -54,4 +54,4 @@ git tag v$NEW_VERSION git push origin master git push --tags) -npm publish $PROJECT \ No newline at end of file +npm publish $PROJECT From e822a77ece72acbbbabb186a9ce290a2f46e9248 Mon Sep 17 00:00:00 2001 From: Steve Birks Date: Wed, 25 Jan 2012 17:12:59 +0000 Subject: [PATCH 2/2] Improve extraction of name/version from JSON. Noww caters for when the JSON is on same line --- bin/usenode-release | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/usenode-release b/bin/usenode-release index c618786..2c8ed6d 100755 --- a/bin/usenode-release +++ b/bin/usenode-release @@ -24,10 +24,10 @@ if [ "x$UNCOMMITTED_CHANGES_CHECK" != "x" ]; then exit 1 fi -PROJECT_NAME=`sed -ne 's/[ ,]//g; s/^"name":"\(.*\)"/\1/p' $PACKAGE` +PROJECT_NAME=`sed -n 's/[ ,]//g; s/.*"name":"\(.*\)".*/\1/p' $PACKAGE` echo "Publishing '$PROJECT_NAME'." -CURRENT_VERSION=`sed -ne 's/[ ,]//g; s/^"version":"\(.*\)"/\1/p' $PACKAGE` +CURRENT_VERSION=`sed -n 's/[ ,]//g; s/.*"version":"\(.*\)".*/\1/p' $PACKAGE` echo "Current version is $CURRENT_VERSION." if [ "x$NEW_VERSION" = "x" ]; then