diff --git a/scripts/npm-publish.sh b/scripts/npm-publish.sh index 707cd7df66..c90aecca61 100755 --- a/scripts/npm-publish.sh +++ b/scripts/npm-publish.sh @@ -17,10 +17,10 @@ cd "$DIR/../demo-shell-ng2" show_help() { echo "Usage: npm-publish.sh" echo "" - echo "-f or -force publish the package with force" - echo "-r or -registry to publish in an alternative npm registry -registry 'http://npm.local.me:8080/' " + echo "-f or --force publish the package with force" + echo "-r or --registry to publish in an alternative npm registry -registry 'http://npm.local.me:8080/' " echo "-token auth token for publish in the npm registry" - echo "-t or -tag to add a tag when publish a package" + echo "-t or --tag to add a tag when publish a package" echo "--sleep add a sleep before any publish" echo "-gitjsapi to build all the components against a commit-ish version of the JS-API" } diff --git a/scripts/update-version.sh b/scripts/update-version.sh index 37f2ca7549..837d33b048 100755 --- a/scripts/update-version.sh +++ b/scripts/update-version.sh @@ -69,6 +69,12 @@ update_component_version() { sed "${sedi[@]}" "s/\"version\": \"[0-9]\\.[0-9]\\.[0-9]\"/\"version\": \"${VERSION}\"/g" ${DESTDIR}/package.json } +clean_lock() { + echo "====== clean lock file ${1} ======" + DESTDIR="$DIR/../ng2-components/${1}" + rm ${DESTDIR}/package-lock.json +} + update_component_dependency_version(){ DESTDIR="$DIR/../ng2-components/${1}" @@ -79,14 +85,7 @@ update_component_dependency_version(){ sed "${sedi[@]}" "s/\"${projects[$j]}\": \"[0-9]\\.[0-9]\\.[0-9]\"/\"${projects[$j]}\": \"${VERSION}\"/g" ${DESTDIR}/package.json sed "${sedi[@]}" "s/\"${projects[$j]}\": \"~[0-9]\\.[0-9]\\.[0-9]\"/\"${projects[$j]}\": \"~${VERSION}\"/g" ${DESTDIR}/package.json - if [[ "${1}" != "ng2-alfresco-core" ]] - then - echo "====== UPDATE DEPENDENCY VERSION of ${projects[$j]} to ~${VERSION} in ${1} DEMO ======" - sed "${sedi[@]}" "s/\"${projects[$j]}\": \"[0-9]\\.[0-9]\\.[0-9]\"/\"${projects[$j]}\": \"${VERSION}\"/g" ${DESTDIR}/demo/package.json - sed "${sedi[@]}" "s/\"${projects[$j]}\": \"~[0-9]\\.[0-9]\\.[0-9]\"/\"${projects[$j]}\": \"~${VERSION}\"/g" ${DESTDIR}/demo/package.json - fi - - done + done } update_total_build_dependency_version(){ @@ -121,10 +120,6 @@ update_component_js_version(){ sed "${sedi[@]}" "s/\"${PACKAGETOCHANGE}\": \"[0-9]\\.[0-9]\\.[0-9]\"/\"${PACKAGETOCHANGE}\": \"${2}\"/g" ${DESTDIR}/package.json sed "${sedi[@]}" "s/\"${PACKAGETOCHANGE}\": \"~[0-9]\\.[0-9]\\.[0-9]\"/\"${PACKAGETOCHANGE}\": \"~${2}\"/g" ${DESTDIR}/package.json - echo "====== UPDATE DEPENDENCY VERSION of alfresco-js-api to ${2} in ${1} DEMO ======" - - sed "${sedi[@]}" "s/\"${PACKAGETOCHANGE}\": \"[0-9]\\.[0-9]\\.[0-9]\"/\"${PACKAGETOCHANGE}\": \"${2}\"/g" ${DESTDIR}/demo/package.json - sed "${sedi[@]}" "s/\"${PACKAGETOCHANGE}\": \"~[0-9]\\.[0-9]\\.[0-9]\"/\"${PACKAGETOCHANGE}\": \"~${2}\"/g" ${DESTDIR}/demo/package.json } update_demo_shell_dependency_version(){ @@ -151,6 +146,11 @@ update_demo_shell_js_version(){ sed "${sedi[@]}" "s/\"${PACKAGETOCHANGE}\": \"~[0-9]\\.[0-9]\\.[0-9]\"/\"${PACKAGETOCHANGE}\": \"~${1}\"/g" ${DESTDIR}/package.json } +clean_lock_demo_shell(){ + echo "====== clean lock file demo-shell ======" + DESTDIR="$DIR/../demo-shell-ng2/" + rm ${DESTDIR}/package-lock.json +} while [[ $1 == -* ]]; do case "$1" in @@ -186,6 +186,7 @@ if $EXEC_COMPONENT == true; then # use for loop to read all values and indexes for (( i=0; i<${projectslength}; i++ )); do + clean_lock ${projects[$i]} echo "====== UPDATE COMPONENT ${projects[$i]} ======" update_component_version ${projects[$i]} update_component_dependency_version ${projects[$i]} @@ -217,6 +218,8 @@ fi echo "====== UPDATE DEMO SHELL ======" +clean_lock_demo_shell + update_demo_shell_dependency_version if $JS_API == true; then