hendrik/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

Revert NO_PROXY mangle

Browse Source 
Signed-off-by: Lauri Nevala <lauri.nevala@gmail.com>
This commit is contained in:
Lauri Nevala 2020-09-30 11:29:46 +03:00
parent 0d459c396d
commit 0b5ed4b8f6
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/kubectl.ts
View File

@ -284,10 +284,11 @@ export class Kubectl {
bashScript += `export PATH="${helmPath}:${kubectlPath}:$PATH"\n` bashScript += `export PATH="${helmPath}:${kubectlPath}:$PATH"\n`
bashScript += "export KUBECONFIG=\"$tempkubeconfig\"\n" bashScript += "export KUBECONFIG=\"$tempkubeconfig\"\n"
bashScript += "NO_PROXY=\",${NO_PROXY:-localhost},\"\n" bashScript += "if [ -z \"$NO_PROXY\" ]; then\n"
bashScript += "NO_PROXY=\"${NO_PROXY//,localhost,/,}\"\n" bashScript += " export NO_PROXY=\"localhost,127.0.0.1\"\n"
bashScript += "NO_PROXY=\"${NO_PROXY//,127.0.0.1,/,}\"\n" bashScript += "elif [ \"$NO_PROXY\" != \"localhost,127.0.0.1\" ]; then\n"
bashScript += "NO_PROXY=\"localhost,127.0.0.1${NO_PROXY%,}\"\n" bashScript += " export NO_PROXY=\"localhost,127.0.0.1,$NO_PROXY\"\n"
bashScript += "fi\n"
bashScript += "unset tempkubeconfig\n" bashScript += "unset tempkubeconfig\n"
await fsPromises.writeFile(bashScriptPath, bashScript.toString(), { mode: 0o644 }) await fsPromises.writeFile(bashScriptPath, bashScript.toString(), { mode: 0o644 })
@ -313,10 +314,11 @@ export class Kubectl {
zshScript += "d=${d/#:/}\n" zshScript += "d=${d/#:/}\n"
zshScript += "export PATH=\"$helmpath:$kubectlpath:${d/%:/}\"\n" zshScript += "export PATH=\"$helmpath:$kubectlpath:${d/%:/}\"\n"
zshScript += "export KUBECONFIG=\"$tempkubeconfig\"\n" zshScript += "export KUBECONFIG=\"$tempkubeconfig\"\n"
zshScript += "NO_PROXY=\",${NO_PROXY:-localhost},\"\n" zshScript += "if test -z \"$NO_PROXY\"; then\n"
zshScript += "NO_PROXY=\"${NO_PROXY//,localhost,/,}\"\n" zshScript += " export NO_PROXY=\"localhost,127.0.0.1\"\n"
zshScript += "NO_PROXY=\"${NO_PROXY//,127.0.0.1,/,}\"\n" zshScript += "elif [ \"$NO_PROXY\" != \"localhost,127.0.0.1\" ]; then\n"
zshScript += "NO_PROXY=\"localhost,127.0.0.1${NO_PROXY%,}\"\n" zshScript += " export NO_PROXY=\"localhost,127.0.0.1,$NO_PROXY\"\n"
zshScript += "fi\n"
zshScript += "unset tempkubeconfig\n" zshScript += "unset tempkubeconfig\n"
zshScript += "unset OLD_ZDOTDIR\n" zshScript += "unset OLD_ZDOTDIR\n"
await fsPromises.writeFile(zshScriptPath, zshScript.toString(), { mode: 0o644 }) await fsPromises.writeFile(zshScriptPath, zshScript.toString(), { mode: 0o644 })