Merge branch 'master' into platform-image

1 files changed, 0 insertions, 24 deletions

diff --git a/configure b/configure
index cc96f038b0..8b82a72083 100755
--- a/configure
+++ b/configure
@@ -15,22 +15,6 @@ function finish {
 }
 trap finish EXIT
 
-# Install node
-if [[ ! -d ~/.nvm ]]; then
-    git clone --depth 1 https://github.com/creationix/nvm.git ~/.nvm
-fi
-set +u
-. ~/.nvm/nvm.sh
-if [ ! `nvm use 0.10 > /dev/null; echo $?` = 0 ]; then
-    >&2 echo -en "\033[1m\033[32m* "
-    nvm install 0.10
-    >&2 echo -en "\033[0m";
-else
-    >&2 echo -en "\033[1m\033[32m* "
-    nvm use 0.10
-    >&2 echo -en "\033[0m";
-fi
-
 # Install mason
 if [[ ! -d ~/.mason ]]; then
     >&2 echo -e "\033[1m\033[32m* Installing Mason\033[0m"
@@ -58,14 +42,8 @@ esac
 
 function abort { >&2 echo -e "\033[1m\033[31m$1\033[0m"; exit 1; }
 
-NODE=`which node || abort 'Cannot find node'`
-NPM=`which npm || abort 'Cannot find npm'`
 PYTHON=`which python || abort 'Cannot find python'`
 
->&2 echo -en "\033[1m\033[32m* Using npm "
->&2 ${NPM} --version
->&2 echo -en "\033[0m";
-
 >&2 echo -en "\033[1m\033[32m* Using "
 >&2 ${PYTHON} --version
 >&2 echo -en "\033[0m";
@@ -86,8 +64,6 @@ CONFIG="# Do not edit. Generated by the configure script.
     'libraries': []
   },
   'variables': {
-    'node': '${NODE}',
-    'npm': '${NPM}',
     'python': '${PYTHON}',
 "