From ee23f43bd339777399973cb0aded07cc3a004735 Mon Sep 17 00:00:00 2001
From: Daijiro Wachi <daijiro.wachi@gmail.com>
Date: Wed, 5 Apr 2017 05:19:33 +0900
Subject: cli: replace cli.js with bin/npm-cli.js and remove cli.js (#12096)

* scripts: replace cli.js with npm-cli.js

* cli: remove unused file cli.js

* docs: replace cli.js with bin/npm-cli.js

PR-URL: https://github.com/npm/npm/pull/12096
Credit: @watilde
Reviewed-By: @zkat
---
 scripts/doc-build.sh | 2 +-
 scripts/install.sh   | 4 ++--
 scripts/release.sh   | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'scripts')

diff --git a/scripts/doc-build.sh b/scripts/doc-build.sh
index 61819028b..b951eb7d3 100755
--- a/scripts/doc-build.sh
+++ b/scripts/doc-build.sh
@@ -62,7 +62,7 @@ src=$1
 dest=$2
 name=$(basename ${src%.*})
 date=$(date -u +'%Y-%m-%d %H:%M:%S')
-version=$(node cli.js -v)
+version=$(node bin/npm-cli.js -v)
 
 mkdir -p $(dirname $dest)
 
diff --git a/scripts/install.sh b/scripts/install.sh
index e6624f061..a81faba58 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -256,8 +256,8 @@ cd "$TMP" \
         make="NOMAKE"
       fi
       if [ "$make" = "NOMAKE" ]; then
-        "$node" cli.js rm npm -gf
-        "$node" cli.js install -gf
+        "$node" bin/npm-cli.js rm npm -gf
+        "$node" bin/npm-cli.js install -gf
       fi) \
   && cd "$BACK" \
   && rm -rf "$TMP" \
diff --git a/scripts/release.sh b/scripts/release.sh
index abe6c197f..1a0c3b687 100644
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -8,7 +8,7 @@ set -e
 
 rm -rf release *.tgz || true
 mkdir release
-node ./cli.js pack --loglevel error >/dev/null
+node ./bin/npm-cli.js pack --loglevel error >/dev/null
 mv *.tgz release
 cd release
 tar xzf *.tgz
@@ -18,12 +18,12 @@ mv package node_modules/npm
 
 # make the zip for windows users
 cp node_modules/npm/bin/*.cmd .
-zipname=npm-$(node ../cli.js -v).zip
+zipname=npm-$(node ../bin/npm-cli.js -v).zip
 zip -q -9 -r -X "$zipname" *.cmd node_modules
 
 # make the tar for node's deps
 cd node_modules
-tarname=npm-$(node ../../cli.js -v).tgz
+tarname=npm-$(node ../../bin/npm-cli.js -v).tgz
 tar czf "$tarname" npm
 
 cd ..
-- 
cgit v1.2.3