nvm-vanilla 1.0.16 → 1.0.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nvm-vanilla",
-  "version": "1.0.16",
+  "version": "1.0.18",
   "description": "",
   "main": "index.js",
   "bin": {

package/src/index.js

@@ -211,9 +211,23 @@ const clear = async (dir) => {
     }
 };
 
+const getNodePackageFilePath = (baseDir, name) => {
+    if (process.platform === 'win32') {
+        return path.join(baseDir, name, 'prefix', 'node_modules', nodePackageName, 'package.json');
+    }
+    return path.join(baseDir, name, 'prefix', 'lib', 'node_modules', nodePackageName, 'package.json');
+};
+
+const getPrefixBinDir = (baseDir, name) => {
+    if (process.platform === 'win32') {
+        return path.join(baseDir, name, 'prefix');
+    }
+    return path.join(baseDir, name, 'prefix', 'bin');
+};
+
 const getLocalNodeVersion = async (baseDir, name) => {
     let aliasFile = path.join(baseDir, name);
-    let packageFile = path.join(baseDir, name, 'prefix', 'node_modules', nodePackageName, 'package.json');
+    let packageFile = getNodePackageFilePath(baseDir, name);
 
     let [
         aliasVersion,
@@ -224,7 +238,7 @@ const getLocalNodeVersion = async (baseDir, name) => {
     ]);
 
     if (aliasVersion) {
-        packageFile = path.join(baseDir, aliasVersion, 'prefix', 'node_modules', nodePackageName, 'package.json');
+        packageFile = getNodePackageFilePath(baseDir, aliasVersion);
         packageData = await readJsonFile(packageFile).catch(() => { });
     }
     
@@ -345,6 +359,10 @@ const init = async (baseDir, version) => {
 const uninstall = async (baseDir, version) => {
     const workDir = path.join(baseDir, version);
 
+    try {
+        await promisify(fs.unlink)(workDir);
+    } catch (_) { }
+
     try {
         await clear(workDir);
     } catch (_) { }
@@ -352,8 +370,7 @@ const uninstall = async (baseDir, version) => {
 
 const which = async (baseDir, name) => {
     const version = await getLocalNodeVersion(baseDir, name);
-    const prefixDir = path.join(baseDir, version, 'prefix');
-    return prefixDir;
+    return getPrefixBinDir(baseDir, version);
 };
 
 const use = async (baseDir, version, evalFlag = true) => {
@@ -363,11 +380,13 @@ const use = async (baseDir, version, evalFlag = true) => {
     }
 
     // const workDir = path.join(baseDir, version, 'bin');
-
     // const workDir = path.join(baseDir, version, 'node_modules', '.bin');
-    const prefixDir = path.join(baseDir, version, 'prefix');
+
+    const prefixDir = path.join(baseDir, version, 'prefix'); 
     const cacheDir = path.join(baseDir, version, 'cache');
 
+    const prefixBinDir = getPrefixBinDir(baseDir, version);
+
     const resetFlag = version === 'system';
 
     // let checkFlag = false;
@@ -384,7 +403,7 @@ const use = async (baseDir, version, evalFlag = true) => {
 
     list = list.filter(item => item.indexOf(baseDir) === -1);
 
-    if (!resetFlag) list.unshift(prefixDir);
+    if (!resetFlag) list.unshift(prefixBinDir);
 
     const env = {};
 
@@ -426,7 +445,7 @@ const list = async (baseDir) => {
     let versionList = await Promise.all(nameList.map(async name => {
         const version = await getLocalNodeVersion(baseDir, name).catch(() => { });
         if (!version) {
-            await uninstall(baseDir, version);
+            await uninstall(baseDir, name);
             return;
         }
         return 'node@' + name + ' (' + version + ')';