primal/athens
1
0
Fork 0
mirror of https://github.com/gomods/athens synced 2026-02-03 11:00:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix proxy not work when lower case is unset. (#1332)

Browse Source 
* fix proxy not enable when proxy lower is unset.

* Update prepare_env.go

format blankspace
This commit is contained in:
psy-core
2019-09-27 06:44:40 +08:00
committed by Aaron Schlesinger
parent f19e855923
commit 97a2df4414
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/module/prepare_env.go
+11 -7
View File
@@ -16,10 +16,6 @@ func prepareEnv(gopath string, envVars []string) []string {
httpProxy := fmt.Sprintf("HTTP_PROXY=%s", os.Getenv("HTTP_PROXY"))
httpsProxy := fmt.Sprintf("HTTPS_PROXY=%s", os.Getenv("HTTPS_PROXY"))
noProxy := fmt.Sprintf("NO_PROXY=%s", os.Getenv("NO_PROXY"))
// need to also check the lower case version of just these three env variables
httpProxyLower := fmt.Sprintf("http_proxy=%s", os.Getenv("http_proxy"))
httpsProxyLower := fmt.Sprintf("https_proxy=%s", os.Getenv("https_proxy"))
noProxyLower := fmt.Sprintf("no_proxy=%s", os.Getenv("no_proxy"))
gopathEnv := fmt.Sprintf("GOPATH=%s", gopath)
cacheEnv := fmt.Sprintf("GOCACHE=%s", filepath.Join(gopath, "cache"))
gitSSH := fmt.Sprintf("GIT_SSH=%s", os.Getenv("GIT_SSH"))
@@ -36,14 +32,22 @@ func prepareEnv(gopath string, envVars []string) []string {
httpProxy,
httpsProxy,
noProxy,
httpProxyLower,
httpsProxyLower,
noProxyLower,
gitSSH,
gitSSHCmd,
}
cmdEnv = append(cmdEnv, envVars...)
// need to also check the lower case version of just these three env variables
if httpProxyLower, exist := os.LookupEnv("http_proxy"); exist {
cmdEnv = append(cmdEnv, fmt.Sprintf("http_proxy=%s", httpProxyLower))
}
if httpsProxyLower, exist := os.LookupEnv("https_proxy"); exist {
cmdEnv = append(cmdEnv, fmt.Sprintf("https_proxy=%s", httpsProxyLower))
}
if noProxyLower, exist := os.LookupEnv("no_proxy"); exist {
cmdEnv = append(cmdEnv, fmt.Sprintf("no_proxy=%s", noProxyLower))
}
if sshAuthSockVal, hasSSHAuthSock := os.LookupEnv("SSH_AUTH_SOCK"); hasSSHAuthSock {
// Verify that the ssh agent unix socket exists and is a unix socket.
st, err := os.Stat(sshAuthSockVal)