update

d2learn · Jan 24, 2025 · e32aa72 · e32aa72
1 parent 21ffb31
commit e32aa72
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 18 deletions.
diff --git a/pkgs/n/nodejs.lua b/pkgs/n/nodejs.lua
@@ -72,12 +72,20 @@ end
 
 function config()
     print("Configuring Node.js ...")
-    local node_xvm_cmd_template1 = "xvm add node %s --path %s/bin"
-    local node_xvm_cmd_template2 = "xvm add nodejs %s --path %s/bin --alias node"
-    local npm_xvm_cmd_template = "xvm add npm node-%s --path %s/bin"
-    os.exec(string.format(node_xvm_cmd_template1, pkginfo.version, pkginfo.install_dir))
-    os.exec(string.format(node_xvm_cmd_template2, pkginfo.version, pkginfo.install_dir))
-    os.exec(string.format(npm_xvm_cmd_template, pkginfo.version, pkginfo.install_dir))
+    local node_xvm_cmd_template1 = "xvm add node %s --path %s"
+    local node_xvm_cmd_template2 = "xvm add nodejs %s --path %s --alias node"
+    local npm_xvm_cmd_template = "xvm add npm node-%s --path %s"
+
+    local bindir = pkginfo.install_dir
+    if is_host("windows") then
+        npm_xvm_cmd_template = npm_xvm_cmd_template .. " --alias npm.cmd"
+    else
+        bindir = path.join(pkginfo.install_dir, "bin")
+    end
+
+    os.exec(string.format(node_xvm_cmd_template1, pkginfo.version, bindir))
+    os.exec(string.format(node_xvm_cmd_template2, pkginfo.version, bindir))
+    os.exec(string.format(npm_xvm_cmd_template, pkginfo.version, bindir))
     return true
 end
 
@@ -87,12 +95,4 @@ function uninstall()
     os.exec("xvm remove nodejs " .. pkginfo.version)
     os.exec("xvm remove npm node-" .. pkginfo.version)
     return true
-end
-
--- helper functions
-
-function get_npm_version()
-    os.addenv("PATH", pkginfo.install_dir .. "/bin")
-    local npm_version = os.iorun("npm --version")
-    return npm_version
 end
diff --git a/pkgs/n/npm.lua b/pkgs/n/npm.lua
@@ -47,8 +47,16 @@ end
 
 function config()
     print("config xvm...")
-    local xvm_npm_template = "xvm add npm %s --path %s/bin"
-    os.exec(string.format(xvm_npm_template, pkginfo.version, pkginfo.install_dir))
+    local xvm_npm_template = "xvm add npm %s --path %s"
+
+    local bindir = pkginfo.install_dir
+    if is_host("windows") then
+        xvm_npm_template = xvm_npm_template .. " --alias npm.cmd"
+    else
+        bindir = path.join(pkginfo.install_dir, "bin")
+    end
+
+    os.exec(string.format(xvm_npm_template, pkginfo.version, bindir))
     return true
 end
 

diff --git a/pkgs/p/pnpm.lua b/pkgs/p/pnpm.lua
@@ -45,8 +45,14 @@ end
 
 function config()
     print("config xvm...")
-    local xvm_pnpm_template = "xvm add pnpm %s --path %s/bin"
-    os.exec(string.format(xvm_pnpm_template, pkginfo.version, pkginfo.install_dir))
+    local xvm_pnpm_template = "xvm add pnpm %s --path %s"
+    local bindir = pkginfo.install_dir
+    if is_host("windows") then
+        xvm_pnpm_template = xvm_pnpm_template .. " --alias pnpm.cmd"
+    else
+        bindir = path.join(pkginfo.install_dir, "bin")
+    end
+    os.exec(string.format(xvm_pnpm_template, pkginfo.version, bindir))
     return true
 end
 

diff --git a/pkgs/x/xvm.lua b/pkgs/x/xvm.lua
@@ -48,16 +48,27 @@ local xvm_file = {
     linux = "xvm",
 }
 
+local xvm_shim_file = {
+    windows = "xvm-shim.exe",
+    linux = "xvm-shim",
+}
+
 function installed()
     return os.iorun("xvm --version") ~= nil
 end
 
 function install()
     os.mv(xvm_file[os.host()], bindir)
+    os.mv(xvm_shim_file[os.host()], bindir)
     return true
 end
 
 function uninstall()
+    -- remove cache files
+    os.tryrm(xvm_file[os.host()])
+    os.tryrm(xvm_shim_file[os.host()])
+    -- remove xvm and xvm-shim from bindir
     os.tryrm(path.join(bindir, xvm_file[os.host()]))
+    os.tryrm(path.join(bindir, xvm_shim_file[os.host()]))
     return true
 end