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

Better parsing of settings.

Browse Source 
Replacing prefix only if is in head of line.

Tested using below
nvm proxy http://username:password@cchproxy:8080 & nvm proxy

nvm proxy username:password@cchproxy:8080 & nvm proxy
nvm proxy http://proxy:10080 & nvm proxy
nvm proxy http://proxy:proxy@proxy:10080 & nvm proxy
nvm proxy proxy:10080 & nvm proxy

concerning  https://github.com/coreybutler/nvm-windows/issues/186
This commit is contained in:
antxgit
2016-09-03 01:32:16 +09:00
committed by Corey Butler
parent f857545a0d
commit 8a673b24b4
1 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/nvm.go
View File

@@ -569,20 +569,21 @@ func Setup() {
// Process each line and extract the value
for _, line := range lines {
if strings.Contains(line,"root:") {
env.root = strings.Trim(regexp.MustCompile("root:").ReplaceAllString(line,"")," \r\n")
} else if strings.Contains(line,"originalpath:") {
env.originalpath = strings.Trim(regexp.MustCompile("originalpath:").ReplaceAllString(line,"")," \r\n")
} else if strings.Contains(line,"originalversion:") {
env.originalversion = strings.Trim(regexp.MustCompile("originalversion:").ReplaceAllString(line,"")," \r\n")
} else if strings.Contains(line,"arch:"){
env.arch = strings.Trim(regexp.MustCompile("arch:").ReplaceAllString(line,"")," \r\n")
} else if strings.Contains(line, "node_mirror:"){
env.node_mirror = strings.Trim(regexp.MustCompile("node_mirror:").ReplaceAllString(line,"")," \r\n")
} else if strings.Contains(line, "npm_mirror:"){
env.npm_mirror = strings.Trim(regexp.MustCompile("npm_mirror:").ReplaceAllString(line,"")," \r\n")
} else if strings.Contains(line,"proxy:"){
env.proxy = strings.Trim(regexp.MustCompile("proxy:").ReplaceAllString(line,"")," \r\n")
line = strings.Trim(line, " \r\n")
if strings.HasPrefix(line, "root:") {
env.root = strings.TrimSpace(regexp.MustCompile("^root:").ReplaceAllString(line, ""))
} else if strings.HasPrefix(line, "originalpath:") {
env.originalpath = 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
@@ -591,6 +592,7 @@ func Setup() {
}
}
}
web.SetMirrors(env.node_mirror, env.npm_mirror)
env.arch = arch.Validate(env.arch)