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

Merge pull request #508 from Himself65/dev

Browse Source 
Fixes load settings.txt
This commit is contained in:
Corey Butler
2021-09-11 00:36:56 -05:00
committed by GitHub
parent a631d9554f f57d93c52d
commit d9abcfbba0
1 changed files with 30 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/nvm.go
View File

@@ -5,6 +5,7 @@ import (
"fmt"
"io/ioutil"
"log"
"net/url"
"os"
"os/exec"
"path/filepath"
@@ -747,29 +748,37 @@ func setup() {
}
// Process each line and extract the value
var m map[string]string
for _, line := range lines {
line = strings.Trim(line, " \r\n")
line = os.ExpandEnv(line)
if strings.HasPrefix(line, "root:") {
env.root = filepath.Clean(strings.TrimSpace(regexp.MustCompile("^root:").ReplaceAllString(line, "")))
} else if strings.HasPrefix(line, "originalpath:") {
env.originalpath = filepath.Clean(strings.TrimSpace(regexp.MustCompile("^originalpath:").ReplaceAllString(line, "")))
} else if strings.HasPrefix(line, "originalversion:") {
env.originalversion = strings.TrimSpace(regexp.MustCompile("^originalversion:").ReplaceAllString(line, ""))
} else if strings.HasPrefix(line, "arch:") {
env.arch = strings.TrimSpace(regexp.MustCompile("^arch:").ReplaceAllString(line, ""))
} else if strings.HasPrefix(line, "node_mirror:") {
env.node_mirror = strings.TrimSpace(regexp.MustCompile("^node_mirror:").ReplaceAllString(line, ""))
} else if strings.HasPrefix(line, "npm_mirror:") {
env.npm_mirror = strings.TrimSpace(regexp.MustCompile("^npm_mirror:").ReplaceAllString(line, ""))
} else if strings.HasPrefix(line, "proxy:") {
env.proxy = strings.TrimSpace(regexp.MustCompile("^proxy:").ReplaceAllString(line, ""))
if env.proxy != "none" && env.proxy != "" {
if strings.ToLower(env.proxy[0:4]) != "http" {
env.proxy = "http://"+env.proxy
}
web.SetProxy(env.proxy, env.verifyssl)
}
res := strings.Split(strings.TrimSpace(line), ":")
if (len(res) != 2) {
continue
}
m[res[0]] = strings.Trim(res[1], "\r\n")
}
if val, ok := m["root"]; ok {
env.root = filepath.Clean(val)
}
if val, ok := m["originalpath"]; ok {
env.originalpath = filepath.Clean(val)
}
if val, ok := m["originalversion"]; ok {
env.originalversion = val
}
if val, ok := m["arch"]; ok {
env.arch = val
}
if val, ok := m["node_mirror"]; ok {
env.node_mirror = val
}
if val, ok := m["npm_mirror"]; ok {
env.npm_mirror = val
}
if val, ok := m["proxy"]; ok {
res, err := url.Parse(val)
if err != nil {
web.SetProxy(res.String(), env.verifyssl)
}
}