diff --git a/tools/install.py b/tools/install.py index d51ac06d7b..afebb60e99 100755 --- a/tools/install.py +++ b/tools/install.py @@ -98,6 +98,15 @@ def npm_files(action): else: assert(0) # unhandled action type + # create/remove symlink + link_path = abspath(install_path, 'bin/npx') + if action == uninstall: + action([link_path], 'bin/npx') + elif action == install: + try_symlink('../lib/node_modules/npm/bin/npx-cli.js', link_path) + else: + assert(0) # unhandled action type + def subdir_files(path, dest, action): ret = {} for dirpath, dirnames, filenames in os.walk(path): diff --git a/tools/msvs/msi/product.wxs b/tools/msvs/msi/product.wxs index a21a3bb3ef..c8a89d7255 100755 --- a/tools/msvs/msi/product.wxs +++ b/tools/msvs/msi/product.wxs @@ -95,6 +95,8 @@ Description="!(loc.npm_Description)"> + + @@ -215,6 +217,14 @@ + + + + + + + + diff --git a/tools/osx-pkg-postinstall.sh b/tools/osx-pkg-postinstall.sh index c4c872fc78..8212c27f8e 100644 --- a/tools/osx-pkg-postinstall.sh +++ b/tools/osx-pkg-postinstall.sh @@ -3,3 +3,4 @@ # TODO Can we extract $PREFIX from the installer? cd /usr/local/bin ln -sf ../lib/node_modules/npm/bin/npm-cli.js npm +ln -sf ../lib/node_modules/npm/bin/npx-cli.js npx