diff --git a/scripts/npm.bat b/scripts/npm.bat index 2759655c8b4e..9c3e6fbf6b4a 100644 --- a/scripts/npm.bat +++ b/scripts/npm.bat @@ -1,4 +1,6 @@ @echo off +SET SUPPORTEDNPMVERSION=4.2.0 + setlocal set npm_config_disturl="https://atom.io/download/electron" for /f "tokens=2 delims=:, " %%a in ('findstr /R /C:"\"electronVersion\":.*" "%~dp0..\package.json"') do set npm_config_target=%%~a @@ -6,3 +8,11 @@ set npm_config_runtime="electron" set npm_config_cache=~\.npm-electron npm %* endlocal + +for /F "tokens=* USEBACKQ" %%V IN (`npm --version`) do ( + set CURRENTNPMVERSION=%%V +) +if not %CURRENTNPMVERSION%==%SUPPORTEDNPMVERSION% ( + color 0e + echo NPM version %CURRENTNPMVERSION% is not supported with this project. We strongly recommend to use version %SUPPORTEDNPMVERSION% +) diff --git a/scripts/npm.sh b/scripts/npm.sh index 69c6d0c48aec..f9ad5552d566 100755 --- a/scripts/npm.sh +++ b/scripts/npm.sh @@ -1,4 +1,5 @@ #!/bin/bash +SUPPORTEDNPMVERSION="4.2.0" if [[ "$OSTYPE" == "darwin"* ]]; then realpath() { [[ $1 = /* ]] && echo "$1" || echo "$PWD/${1#./}"; } @@ -8,7 +9,7 @@ else ROOT=$(dirname "$(dirname "$(readlink -f $0)")") # if [ -z $npm_config_arch ]; then - # npm_config_arch=$(node -p process.arch) + # npm_config_arch=$(npm -p process.arch) # echo "Warning: remember to set \$npm_config_arch to either x64 or ia32 to build the binaries for the right architecture. Picking '$npm_config_arch'." # fi fi @@ -26,4 +27,10 @@ npm_config_disturl=https://atom.io/download/electron \ npm_config_target=$ELECTRON_VERSION \ npm_config_runtime=electron \ HOME=$ELECTRON_GYP_HOME \ -npm $* \ No newline at end of file +npm $* + +CURRENTNPMVERSION=`npm --version` +if [[ "$CURRENTNPMVERSION" != "$SUPPORTEDNPMVERSION" ]]; then + YELLOW='\033[1;33m' + echo -e "${YELLOW}NPM version ${CURRENTNPMVERSION} is not supported with this project. We strongly recommend to use version ${SUPPORTEDNPMVERSION}" +fi