nvm-vanilla 1.0.4 → 1.0.5

package/package.json

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

package/src/bin.js

@@ -17,7 +17,7 @@ const main = async () => {
 
     const homeDir = os.homedir();
 
-    const baseDir = path.join(homeDir, '.nvm2');
+    const baseDir = path.join(homeDir, '.nvm-vanilla');
 
     const args = process.argv.slice(2);
 

package/src/index.js

@@ -203,7 +203,7 @@ const getLocalNodeVersion = async (baseDir, name) => {
     const packageFile = path.join(baseDir, name, 'node_modules', nodePackageName, 'package.json');
     try {
         const { version } = await readJsonFile(packageFile);
-        return version;
+        return version.replace(/^v/, '');
     } catch (_) {
         throw `no local node version "${name}"`;
     }
@@ -363,9 +363,10 @@ const use = async (baseDir, version, evalFlag = true) => {
                 ? `export ${key}=${value}`
                 : `export ${key}=\${${key}:-${value}}`;
 
+            // powershell
             if (process.platform === 'win32') {
                 command = (key === 'PATH' || true)
-                    ? `set ${key}=${value}`
+                    ? `$env:${key}="${value}"`
                     : `if not defined ${key} set ${key}=${value}`;
             }
 
@@ -386,8 +387,7 @@ const list = async (baseDir) => {
     const nameList = await promisify(fs.readdir)(baseDir);
 
     let versionList = await Promise.all(nameList.map(async name => {
-        const packageFile = path.join(baseDir, name, 'node_modules', nodePackageName, 'package.json');
-        const { version } = await readJsonFile(packageFile).catch(() => ({}));
+        const version = getLocalNodeVersion(baseDir, name).catch(() => {});
         if (!version) return;
         return 'node@' + name + ' (' + version + ')';
     }));

package/src/init.js

@@ -3,17 +3,27 @@ const fs = require('fs');
 const path = require('path');
 const { promisify } = require('util');
 
+const pattern = /^.*nvm-vanilla.*$/m;
+
+const insert = async (profilePath, line) => {
+    let content = await promisify(fs.readFile)(profilePath, 'utf-8');
+    if (pattern.test(content)) {
+        content = content.replace(pattern, line);
+    } else {
+        content += '\n' + line;
+    }
+    await promisify(fs.writeFile)(profilePath, content, 'utf-8');
+};
+
 const init = async () => {
     if (process.platform === 'win32') {
-        await promisify(fs.appendFile)(
-            path.resolve(os.homedir(), 'Documents/WindowsPowerShell/Microsoft.PowerShell_profile.ps1'),
-            '\nnvm-vanilla --eval env | Out-String | Invoke-Expression',
-        )
+        const profilePath = path.resolve(os.homedir(), 'Documents/WindowsPowerShell/Microsoft.PowerShell_profile.ps1');
+        const line = 'nvm-vanilla --eval env | Out-String | Invoke-Expression';
+        await insert(content, line);
     } else {
-        await promisify(fs.appendFile)(
-            path.resolve(os.homedir(), '.bashrc'),
-            '\neval "$(nvm-vanilla --eval env)"',
-        );
+        const profilePath = path.resolve(os.homedir(), '.bashrc');
+        const line = 'eval "$(nvm-vanilla --eval env)"';
+        await insert(content, line);
     }
 };
 

package/src/nvm.ps1

@@ -1,7 +1,7 @@
 function nvm {
     $result = nvm-vanilla --eval @args 2>$null
     if ($result) {
-        Invoke-Expression $result
+        Invoke-Expression ($result -join ";")
     } else {
         nvm-vanilla @args
     }