Use env_with_node_in_path() and NODE_JS

Author: juj

tools/install.py

@@ -17,6 +17,12 @@
 import subprocess
 import sys
 
+__rootpath__ = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+sys.path.insert(0, __rootpath__)
+
+from tools import config
+from tools import shared
+
 EXCLUDES = [os.path.normpath(x) for x in '''
 test/third_party
 tools/maint
@@ -86,7 +92,7 @@ def copy_emscripten(target):
 
 
 def get_npm():
-  node = os.getenv('EMSDK_NODE')
+  node = config.NODE_JS[0]
   if not node:
     return shutil.which('npm')
 
@@ -96,12 +102,7 @@ def get_npm():
 
 
 def npm_install(target):
-  env = os.environ.copy()
-  # Make sure that Emsdk Node.js is in PATH instead of potentially old system
-  # Node.js
-  if os.getenv('EMSDK_NODE'):
-    env['PATH'] = os.path.dirname(os.getenv('EMSDK_NODE')) + ':' + env['PATH']
-  subprocess.check_call([get_npm(), 'ci', '--omit=dev'], cwd=target, env=env)
+  subprocess.check_call([get_npm(), 'ci', '--omit=dev'], cwd=target, env=shared.env_with_node_in_path())
 
 
 def main():