From be9ba6b565dd993ed866edfc41d65e7924368f92 Mon Sep 17 00:00:00 2001 From: Tom Freudenberg Date: Thu, 23 Jun 2016 03:39:34 +0200 Subject: [PATCH] Finalize replacement NPM@3 at generate-dev-bundle.sh script --- scripts/generate-dev-bundle.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/scripts/generate-dev-bundle.sh b/scripts/generate-dev-bundle.sh index eda449bb3c..3d55b7e6a9 100755 --- a/scripts/generate-dev-bundle.sh +++ b/scripts/generate-dev-bundle.sh @@ -136,11 +136,8 @@ mv BrowserStackLocal "$DIR/bin/" # Sanity check to see if we're not breaking anything by replacing npm INSTALLED_NPM_VERSION=$(cat "$DIR/lib/node_modules/npm/package.json" | xargs -0 node -e "console.log(JSON.parse(process.argv[1]).version)") -if [ "$INSTALLED_NPM_VERSION" != "3.9.6" ]; then +if [ "$INSTALLED_NPM_VERSION" != "$NPM_VERSION" ]; then echo "Unexpected NPM version in lib/node_modules: $INSTALLED_NPM_VERSION" - echo "We will be replacing it with our own version because the bundled node" - echo "is built using PORTABLE=1, which makes npm look for node relative to" - echo "its own directory." echo "Update this check if you know what you're doing." exit 1 fi