From c1423712222fac1d6dd2a687d23f09263743bd53 Mon Sep 17 00:00:00 2001
From: maurizio vitale <maurizio.vitale@alfresco.com>
Date: Tue, 3 Sep 2019 10:33:41 +0100
Subject: [PATCH] Use enterprise token and npx to avoid install

---
 .travis.yml                              | 2 +-
 scripts/travis/update/update-children.sh | 8 +++-----
 scripts/travis/update/update-project.sh  | 4 ++--
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3bbf7ba233..15358fd2e1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,7 +25,7 @@ stages:
   - name: Lint & Build Dist
     if: type = pull_request
   - name: Lint & Build Dist & Release
-    if: type = push OR type = cron AND tag IS blank
+    if: (type = push OR type = cron) AND tag IS blank
   - name: Check bundle
     if: type = push AND tag IS blank
   - name: Unit test
diff --git a/scripts/travis/update/update-children.sh b/scripts/travis/update/update-children.sh
index b921948ed1..87886c66f4 100755
--- a/scripts/travis/update/update-children.sh
+++ b/scripts/travis/update/update-children.sh
@@ -6,13 +6,11 @@ echo "Update Generator"
 ./scripts/travis/update/update-project.sh -gnu -t $GITHUB_TOKEN -n 'Alfresco/generator-ng2-alfresco-app'
 echo "Update ACA"
 ./scripts/travis/update/update-project.sh -gnu -t $GITHUB_TOKEN -n 'Alfresco/alfresco-content-app'
-echo "Update ADW"
-./scripts/travis/update/update-project.sh -gnu -t $GITHUB_TOKEN -n 'Alfresco/adf-app-manager-ui'
 echo "Update ADF"
 ./scripts/travis/update/update-project.sh -gnu -t $GITHUB_TOKEN -n 'Alfresco/alfresco-ng2-components'
 echo "Update AMA"
-./scripts/travis/update/update-project.sh -gnu -t $GITHUB_TOKEN -n 'Alfresco/alfresco-modeler-app'
+./scripts/travis/update/update-project.sh -gnu -t $GITHUB_ENTERPRISE_TOKEN -n 'Alfresco/alfresco-modeler-app'
 echo "Update Workspace"
-./scripts/travis/update/update-project.sh -gnu -t $GITHUB_TOKEN -n 'Alfresco/alfresco-process-workspace-app'
+./scripts/travis/update/update-project.sh -gnu -t $GITHUB_ENTERPRISE_TOKEN -n 'Alfresco/alfresco-process-workspace-app'
 echo "Update APA Activiti"
-./scripts/travis/update/update-project.sh -gnu -t $GITHUB_TOKEN -n 'Alfresco/alfresco-admin-app'
+./scripts/travis/update/update-project.sh -gnu -t $GITHUB_ENTERPRISE_TOKEN -n 'Alfresco/alfresco-admin-app'
diff --git a/scripts/travis/update/update-project.sh b/scripts/travis/update/update-project.sh
index 056397c235..2f2b901d03 100755
--- a/scripts/travis/update/update-project.sh
+++ b/scripts/travis/update/update-project.sh
@@ -48,9 +48,9 @@ BRANCH="ADF-update-beta-$VERSION"
 git checkout -b $BRANCH
 
 if $GNU; then
-    ./node_modules/@alfresco/adf-cli/bin/adf-cli update-version --pathPackage "$(pwd)" --version $VERSION --vjs $JS_VERSION
+    npx adf-cli update-version --pathPackage "$(pwd)" --version $VERSION --vjs $JS_VERSION
 else
-    ./node_modules/@alfresco/adf-cli/bin/adf-cli update-version --pathPackage "$(pwd)" --version $VERSION --vjs $JS_VERSION --skipGnu
+    npx adf-cli update-version --pathPackage "$(pwd)" --version $VERSION --vjs $JS_VERSION --skipGnu
 fi
 
 git add .