From f9b8e8efc838b3e5c406e9903d3b12ef23dafc8e Mon Sep 17 00:00:00 2001 From: Eugenio Romano Date: Tue, 23 May 2017 10:34:41 +0100 Subject: [PATCH 1/4] fix tag publish --- scripts/npm-publish.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/npm-publish.sh b/scripts/npm-publish.sh index 6a7f96f4f2..fe10c3f3c8 100755 --- a/scripts/npm-publish.sh +++ b/scripts/npm-publish.sh @@ -56,7 +56,7 @@ add_tag(){ fi echo "====== TAG WILL BE ADDED DURING THE PUBLISH: ${TAG} =====" - OPTIONS="$OPTIONS -tag $1" + OPTIONS="$OPTIONS --tag $1" } change_registry(){ From 4a753e6aa3b36c49a5360c7b98999188ef331edc Mon Sep 17 00:00:00 2001 From: Eugenio Romano Date: Tue, 23 May 2017 12:02:15 +0100 Subject: [PATCH 2/4] update version script modify --- scripts/update-version.sh | 56 ++++++++++++++++++++++++++++++++++----- 1 file changed, 49 insertions(+), 7 deletions(-) diff --git a/scripts/update-version.sh b/scripts/update-version.sh index c9417b29e6..5b152c417c 100755 --- a/scripts/update-version.sh +++ b/scripts/update-version.sh @@ -1,12 +1,34 @@ #!/usr/bin/env bash DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +eval JS_API=true -set -ex +show_help() { + echo "Usage: update-version.sh" + echo "" + echo "-sj or -sjsapi don't update js-api version" + echo "-v or -version version to update" +} -cd `dirname $0` +skip_js() { + echo "====== Skip JS-API change version $1 =====" + JS_API=false +} + +version_change() { + echo "====== New version $1 =====" + VERSION=$1 +} + +while [[ $1 == -* ]]; do + case "$1" in + -h|--help|-\?) show_help; exit 0;; + -v|version) version_change $2; shift 2;; + -sj|sjsapi) skip_js; shift;; + -*) shift;; + esac +done -VERSION=$1 if [[ "${VERSION}" == "" ]] then @@ -30,14 +52,24 @@ for PACKAGE in \ ng2-alfresco-viewer \ ng2-alfresco-webscript \ ng2-alfresco-userinfo \ - ng2-alfresco-social \ - alfresco-js-api + ng2-alfresco-social do DESTDIR="$DIR/../ng2-components/${PACKAGE}" echo "====== UPDATE PACKAGE VERSION of ${PACKAGE} to ${VERSION} version in all the package.json ======" find ././../ -type f -maxdepth 4 -name package.json -print0 | xargs -0 sed -i '' "s/\"${PACKAGE}\": \"[0-9]\\.[0-9]\\.[0-9]\"/\"${PACKAGE}\": \"${VERSION}\"/g" done + +if $JS_API == true; then + for PACKAGE in \ + alfresco-js-api + do + DESTDIR="$DIR/../ng2-components/${PACKAGE}" + echo "====== UPDATE PACKAGE VERSION of ${PACKAGE} to ${VERSION} version in all the package.json ======" + find ././../ -type f -maxdepth 4 -name package.json -print0 | xargs -0 sed -i '' "s/\"${PACKAGE}\": \"[0-9]\\.[0-9]\\.[0-9]\"/\"${PACKAGE}\": \"${VERSION}\"/g" + done +fi + for PACKAGE in \ ng2-activiti-diagrams \ ng2-activiti-analytics \ @@ -81,14 +113,24 @@ for PACKAGE in \ ng2-alfresco-viewer \ ng2-alfresco-webscript \ ng2-alfresco-userinfo \ - ng2-alfresco-social \ - alfresco-js-api + ng2-alfresco-social do DESTDIR="$DIR/../ng2-components/${PACKAGE}" echo "====== UPDATE PACKAGE VERSION of ${PACKAGE} to ~${VERSION} version in all the package.json ======" find ././../ -type f -maxdepth 4 -name package.json -print0 | xargs -0 sed -i '' "s/\"${PACKAGE}\": \"~[0-9]\\.[0-9]\\.[0-9]\"/\"${PACKAGE}\": \"~${VERSION}\"/g" done + +if $JS_API == true; then + for PACKAGE in \ + alfresco-js-api + do + DESTDIR="$DIR/../ng2-components/${PACKAGE}" + echo "====== UPDATE PACKAGE VERSION of ${PACKAGE} to ~${VERSION} version in all the package.json ======" + find ././../ -type f -maxdepth 4 -name package.json -print0 | xargs -0 sed -i '' "s/\"${PACKAGE}\": \"~[0-9]\\.[0-9]\\.[0-9]\"/\"${PACKAGE}\": \"~${VERSION}\"/g" + done +fi + for PACKAGE in \ ng2-activiti-diagrams \ ng2-activiti-analytics \ From 92ceb0b867da41da2ffff2d09ed13700663e7b56 Mon Sep 17 00:00:00 2001 From: Eugenio Romano Date: Tue, 23 May 2017 12:42:27 +0100 Subject: [PATCH 3/4] update version folder --- scripts/update-version.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/update-version.sh b/scripts/update-version.sh index 5b152c417c..4359916223 100755 --- a/scripts/update-version.sh +++ b/scripts/update-version.sh @@ -3,6 +3,8 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" eval JS_API=true +cd `dirname $0` + show_help() { echo "Usage: update-version.sh" echo "" @@ -54,7 +56,6 @@ for PACKAGE in \ ng2-alfresco-userinfo \ ng2-alfresco-social do - DESTDIR="$DIR/../ng2-components/${PACKAGE}" echo "====== UPDATE PACKAGE VERSION of ${PACKAGE} to ${VERSION} version in all the package.json ======" find ././../ -type f -maxdepth 4 -name package.json -print0 | xargs -0 sed -i '' "s/\"${PACKAGE}\": \"[0-9]\\.[0-9]\\.[0-9]\"/\"${PACKAGE}\": \"${VERSION}\"/g" done @@ -64,7 +65,6 @@ if $JS_API == true; then for PACKAGE in \ alfresco-js-api do - DESTDIR="$DIR/../ng2-components/${PACKAGE}" echo "====== UPDATE PACKAGE VERSION of ${PACKAGE} to ${VERSION} version in all the package.json ======" find ././../ -type f -maxdepth 4 -name package.json -print0 | xargs -0 sed -i '' "s/\"${PACKAGE}\": \"[0-9]\\.[0-9]\\.[0-9]\"/\"${PACKAGE}\": \"${VERSION}\"/g" done From ee77a1c53f02f260d4edee949552fee31b97adbb Mon Sep 17 00:00:00 2001 From: Eugenio Romano Date: Tue, 23 May 2017 12:59:37 +0100 Subject: [PATCH 4/4] set ex update version --- scripts/update-version.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/update-version.sh b/scripts/update-version.sh index 4359916223..d4cc32af47 100755 --- a/scripts/update-version.sh +++ b/scripts/update-version.sh @@ -3,6 +3,8 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" eval JS_API=true +set -ex + cd `dirname $0` show_help() {