diff options
author | Rebecca Turner <me@re-becca.org> | 2017-09-27 02:19:41 +0300 |
---|---|---|
committer | Rebecca Turner <me@re-becca.org> | 2017-10-02 10:33:37 +0300 |
commit | 5ee55dc71b8b74b8418c3d5ec17483a07b3b6777 (patch) | |
tree | 13e2ab72ec72288be4bdb18f0ffbefab211a1b5a /scripts | |
parent | 2a11f021561acb1eb1ad4ad45ad955793b1eb4af (diff) |
install.sh: Drop upgrading from npm@1 support
This is fine as npm@5 doesn't run on versions of Node.js that ship
npm@1.
Credit: @iarna
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/install.sh | 36 |
1 files changed, 1 insertions, 35 deletions
diff --git a/scripts/install.sh b/scripts/install.sh index a5ce5311f..041c74e0f 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -208,41 +208,7 @@ cd "$TMP" \ && curl -SsL "$url" \ | $tar -xzf - \ && cd "$TMP"/* \ - && (ver=`"$node" bin/read-package-json.js package.json version` - isnpm10=0 - if [ $ret -eq 0 ]; then - if [ -d node_modules ]; then - if "$node" node_modules/semver/bin/semver -v "$ver" -r "1" - then - isnpm10=1 - fi - else - if "$node" bin/semver -v "$ver" -r ">=1.0"; then - isnpm10=1 - fi - fi - fi - - ret=0 - if [ $isnpm10 -eq 1 ] && [ -f "scripts/clean-old.sh" ]; then - if [ "x$skipclean" = "x" ]; then - (exit 0) - else - clean=no - fi - if [ "x$clean" = "xno" ] \ - || [ "x$clean" = "xn" ]; then - echo "Skipping 0.x cruft clean" >&2 - ret=0 - elif [ "x$clean" = "xy" ] || [ "x$clean" = "xyes" ]; then - NODE="$node" /bin/bash "scripts/clean-old.sh" "-y" - ret=$? - else - NODE="$node" /bin/bash "scripts/clean-old.sh" </dev/tty - ret=$? - fi - fi - + && (ret=0 if [ $ret -ne 0 ]; then echo "Aborted 0.x cleanup. Exiting." >&2 exit $ret |