From 140f60b8dc966297e3c690e7edebc9aaac8e2b3c Mon Sep 17 00:00:00 2001 From: Maurizio Vitale Date: Mon, 9 Sep 2019 15:00:04 +0100 Subject: [PATCH] Use npx instead of absolute adf-cli path (#5053) --- scripts/release/release.sh | 4 ++-- scripts/travis/build/build.sh | 4 ++-- scripts/travis/release/release.sh | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/release/release.sh b/scripts/release/release.sh index 2631c4999f..b2646eceb4 100755 --- a/scripts/release/release.sh +++ b/scripts/release/release.sh @@ -33,9 +33,9 @@ release() { git checkout development if $GNU; then - ./node_modules/@alfresco/adf-cli/bin/adf-cli update-version --pathPackage "$(pwd)" --version $VERSION + npx @alfresco/adf-cli update-version --pathPackage "$(pwd)" --version $VERSION else - ./node_modules/@alfresco/adf-cli/bin/adf-cli update-version --pathPackage "$(pwd)" --version $VERSION --skipGnu + npx @alfresco/adf-cli update-version --pathPackage "$(pwd)" --version $VERSION --skipGnu fi git add . diff --git a/scripts/travis/build/build.sh b/scripts/travis/build/build.sh index 8f30f3fbd5..6f4ca51f2f 100755 --- a/scripts/travis/build/build.sh +++ b/scripts/travis/build/build.sh @@ -7,7 +7,7 @@ cd $DIR/../../../ rm -rf tmp && mkdir tmp; npm install @alfresco/adf-cli@alpha -./node_modules/@alfresco/adf-cli/bin/adf-cli update-commit-sha --pointer "HEAD" --pathPackage "$(pwd)" +npx @alfresco/adf-cli update-commit-sha --pointer "HEAD" --pathPackage "$(pwd)" if [[ $TRAVIS_PULL_REQUEST == "false" ]]; then @@ -27,7 +27,7 @@ then ./scripts/npm-build-all.sh || exit 1; else - ./node_modules/@alfresco/adf-cli/bin/adf-cli update-version --alpha --pathPackage "$(pwd)" + npx @alfresco/adf-cli update-version --alpha --pathPackage "$(pwd)" npm install; diff --git a/scripts/travis/release/release.sh b/scripts/travis/release/release.sh index 4c81b7f7aa..0dd67339df 100755 --- a/scripts/travis/release/release.sh +++ b/scripts/travis/release/release.sh @@ -19,4 +19,4 @@ fi; echo "Publishing on npm with tag $TAG_NPM" -./node_modules/@alfresco/adf-cli/bin/adf-cli npm-publish --npmRegistry $NPM_REGISTRY_ADDRESS --tokenRegistry $NPM_REGISTRY_TOKEN --tag $TAG_NPM --pathProject "$(pwd)" +npx @alfresco/adf-cli npm-publish --npmRegistry $NPM_REGISTRY_ADDRESS --tokenRegistry $NPM_REGISTRY_TOKEN --tag $TAG_NPM --pathProject "$(pwd)"