node/nvm-windows
1
0
Fork 0
mirror of https://github.com/coreybutler/nvm-windows.git synced 2026-01-14 07:03:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Support whitespace and non-ASCI characters in path.

Browse Source
This commit is contained in:
Wojciech Sobolewski
2024-02-27 21:14:49 +01:00
parent 94f952aebb
commit bab56dab69
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/nvm.go
View File

@@ -51,10 +51,11 @@ type Environment struct {
var home = filepath.Clean(os.Getenv("NVM_HOME") + "\\settings.txt")
var symlink = filepath.Clean(os.Getenv("NVM_SYMLINK"))
var root = filepath.Clean(os.Getenv("NVM_HOME"))
var env = &Environment{
settings: home,
root: "",
root: root,
symlink: symlink,
arch: os.Getenv("PROCESSOR_ARCHITECTURE"),
node_mirror: "",
@@ -1421,6 +1422,7 @@ func saveSettings() {
content := "root: " + strings.Trim(encode(env.root), " \n\r") + "\r\narch: " + strings.Trim(encode(env.arch), " \n\r") + "\r\nproxy: " + strings.Trim(encode(env.proxy), " \n\r") + "\r\noriginalpath: " + strings.Trim(encode(env.originalpath), " \n\r") + "\r\noriginalversion: " + strings.Trim(encode(env.originalversion), " \n\r")
content = content + "\r\nnode_mirror: " + strings.Trim(encode(env.node_mirror), " \n\r") + "\r\nnpm_mirror: " + strings.Trim(encode(env.npm_mirror), " \n\r")
ioutil.WriteFile(env.settings, []byte(content), 0644)
os.Setenv("NVM_HOME", strings.Trim(encode(env.root), " \n\r"))
}
func getProcessPermissions() (admin bool, elevated bool, err error) {
@@ -1479,8 +1481,8 @@ func setup() {
m[res[0]] = strings.TrimSpace(strings.Join(res[1:], ":"))
}
if val, ok := m["root"]; ok {
env.root = filepath.Clean(val)
if _, ok := m["root"]; ok {
env.root = filepath.Clean(os.Getenv("NVM_HOME"))
}
if val, ok := m["originalpath"]; ok {
env.originalpath = filepath.Clean(val)