Bug fixes

defaults.json

@@ -8,5 +8,5 @@
 		"chakracore": "https://github.com/nodejs/node-chakracore/releases/",
 		"chakracore-nightly": "https://nodejs.org/download/chakracore-nightly/"
 	},
-	"bootstrap": "node/6.9.3"
+	"bootstrap": "node/6.9.4"
 }

lib/link.js

@@ -19,7 +19,7 @@ let nvsWindowsEnv = null; // Lazy load
  * automatically in any new shell environment.
  *
  * @param version A node version to link, or null to use the
- *     current version from the PATH.
+ * 	current version from the PATH.
  */
 function link(version) {
 	if (!version) {
@@ -208,11 +208,11 @@ function linkToProgramFiles(linkTarget) {
  * directory.
  */
 function linkToUsrLocal(linkTarget) {
-    // A normal system Node.js installation uses the following paths:
-    // /usr/local/bin/node
-    // /usr/local/lib/node_modules/
-    // /usr/local/bin/npm -> ../lib/node_modules/npm/bin/npm-cli.js
-    // /usr/local/bin/<exe> -> ../lib/node_modules/<mod>/bin/<exe>
+	// A normal system Node.js installation uses the following paths:
+	// /usr/local/bin/node
+	// /usr/local/lib/node_modules/
+	// /usr/local/bin/npm -> ../lib/node_modules/npm/bin/npm-cli.js
+	// /usr/local/bin/<exe> -> ../lib/node_modules/<mod>/bin/<exe>
 
 	let result = [];
 
@@ -353,7 +353,7 @@ function readLinks(dir, linkTargetFilter) {
  * @param link True to add the link, false to remove it
  * @param linkPath The link path to be added or removed
  * @param isSystem True to modify the system profile,
- *     false to modify the user profile.
+ * 	false to modify the user profile.
  */
 function linkToWindowsProfilePath(link, linkPath, isSystem) {
 	let result = [];

lib/list.js

@@ -40,6 +40,7 @@ function find(filter, versions) {
 		resolvedVersion.semanticVersion,
 		resolvedVersion.arch || filter.arch || NodeVersion.defaultArch);
 	foundVersion.label = resolvedVersion.label;
+	foundVersion.path = resolvedVersion.path;
 	foundVersion.os = NodeVersion.defaultOs;
 
 	if (resolvedVersion.packages) {

lib/version.js

@@ -2,7 +2,7 @@
 const path = require('path');
 
 const versionRegex =
-	/^(([\w\-]+)[\/\-])?((v?(\d+(\.\d+(\.\d+)?)?(-[0-9A-Za-z.]+)?))|([a-z][a-z_\-][0-9a-z_\-]*))(\/((x86)|(32)|((x)?64)|(arm\w*)|(ppc\w*)))?$/i;
+	/^(([\w\-]+)\/)?((v?(\d+(\.\d+(\.\d+)?)?(-[0-9A-Za-z.]+)?))|([a-z][a-z_\-][0-9a-z_\-]*))(\/((x86)|(32)|((x)?64)|(arm\w*)|(ppc\w*)))?$/i;
 
 class NodeVersion {
 	constructor(remoteName, semanticVersion, arch) {

nvs.sh

@@ -8,12 +8,10 @@
 # arguments to the main nvs.js script.
 
 # Try to locate the NVS_ROOT path, where the nvs scripts are installed.
-if [ -z ${NVS_ROOT} ]; then
-	if [ -n "${BASH_SOURCE}" ]; then
-		export NVS_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null && \pwd)"
-	elif [ -n "${NVS_HOME}" ]; then
-		export NVS_ROOT="${NVS_HOME}"
-	fi
+if [ -n "${BASH_SOURCE}" ]; then
+	export NVS_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null && \pwd)"
+elif [ -n "${NVS_HOME}" -a -z ${NVS_ROOT} ]; then
+	export NVS_ROOT="${NVS_HOME}"
 fi
 
 nvs() {