From ee71866702e8545367e7e515764f24a6f5bc4ecf Mon Sep 17 00:00:00 2001
From: Eugenio Romano <eugenio.romano@alfresco.com>
Date: Fri, 30 Aug 2019 10:02:20 +0100
Subject: [PATCH] fix cli command use

---
 .travis.yml                       | 3 ++-
 scripts/build/build-cli.sh        | 5 +++++
 scripts/travis/release/release.sh | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f09bae3ebe..6fdc60ae54 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -115,7 +115,7 @@ jobs:
           script:
           - TAG_VERSION=$(./scripts/travis/deploy/tag-travis-branch.sh)
           - echo "Running the docker with tag" $TAG_VERSION
-          - ./lib/dist/cli/bin/adf-cli docker-publish --loginCheck --loginUsername "$DOCKER_REPOSITORY_USER" --loginPassword "$DOCKER_REPOSITORY_PASSWORD" --loginRepo "$DOCKER_REPOSITORY_DOMAIN" --dockerRepo "$DOCKER_REPOSITORY" --dockerTags "$TAG_VERSION" --pathProject "$(pwd)"
+          - ./node_modules/@alfresco/adf-cli/bin/adf-cli docker-publish --loginCheck --loginUsername "$DOCKER_REPOSITORY_USER" --loginPassword "$DOCKER_REPOSITORY_PASSWORD" --loginRepo "$DOCKER_REPOSITORY_DOMAIN" --dockerRepo "$DOCKER_REPOSITORY" --dockerTags "$TAG_VERSION" --pathProject "$(pwd)"
 
 
         - stage: Update Rancher
@@ -149,4 +149,5 @@ deploy:
 cache:
   directories:
   - node_modules
+  - demo-shell/dist
   - tmp
diff --git a/scripts/build/build-cli.sh b/scripts/build/build-cli.sh
index fbeff7196e..104730dc1c 100755
--- a/scripts/build/build-cli.sh
+++ b/scripts/build/build-cli.sh
@@ -12,3 +12,8 @@ npm run dist
 
 cd $DIR/../../
 cp -R ./lib/cli/dist lib/dist/cli/
+
+echo "====== Move to node_modules ======"
+rm -rf ./node_modules/@alfresco/adf-cli/ && \
+mkdir -p ./node_modules/@alfresco/adf-cli/ && \
+cp -R ./lib/dist/cli/* ./node_modules/@alfresco/adf-cli/
diff --git a/scripts/travis/release/release.sh b/scripts/travis/release/release.sh
index 28d478f9d9..b92f8990eb 100755
--- a/scripts/travis/release/release.sh
+++ b/scripts/travis/release/release.sh
@@ -4,4 +4,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 cd $DIR/../../../
 
-./lib/dist/cli/bin/adf-cli npm-publish --npmRegistry $NPM_REGISTRY_ADDRESS --tokenRegistry $NPM_REGISTRY_TOKEN --tag $TAG_NPM --pathProject "$(pwd)"
+./node_modules/@alfresco/adf-cli/bin/adf-cli npm-publish --npmRegistry $NPM_REGISTRY_ADDRESS --tokenRegistry $NPM_REGISTRY_TOKEN --tag $TAG_NPM --pathProject "$(pwd)"