Commitc637d40

authored

Merge pull request#121 from eargollo/proxy-support

Solves proxy issue,closes#74 when proxy is set at .profile

2 parents8c07a08 +2f52cef commitc637d40Copy full SHA for c637d40

File tree

-6

lines changed

-6

lines changed

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -56,9 +56,9 @@ func sshCode(host, dir string, o options) error {`
`56`	`56`	`dlScript:=downloadScript(codeServerPath)`
`57`	`57`
`58`	`58`	`// Downloads the latest code-server and allows it to be executed.`
`59`		`-sshCmdStr:=fmt.Sprintf("ssh %v %v '/usr/bin/env bash'",o.sshFlags,host)`
	`59`	`+sshCmdStr:=fmt.Sprintf("ssh %v %v '/usr/bin/env bash -l'",o.sshFlags,host)`
`60`	`60`
`61`		`-sshCmd:=exec.Command("sh","-c",sshCmdStr)`
	`61`	`+sshCmd:=exec.Command("sh","-l","-c",sshCmdStr)`
`62`	`62`	`sshCmd.Stdout=os.Stdout`
`63`	`63`	`sshCmd.Stderr=os.Stderr`
`64`	`64`	`sshCmd.Stdin=strings.NewReader(dlScript)`
`@@ -99,7 +99,7 @@ func sshCode(host, dir string, o options) error {`
`99`	`99`	`)`
`100`	`100`
`101`	`101`	`// Starts code-server and forwards the remote port.`
`102`		`-sshCmd=exec.Command("sh","-c",sshCmdStr)`
	`102`	`+sshCmd=exec.Command("sh","-l","-c",sshCmdStr)`
`103`	`103`	`sshCmd.Stdin=os.Stdin`
`104`	`104`	`sshCmd.Stdout=os.Stdout`
`105`	`105`	`sshCmd.Stderr=os.Stderr`
`@@ -397,7 +397,7 @@ func parseHost(host string) (parsedHost string, additionalFlags string, err erro`
`397`	`397`	`funcparseGCPSSHCmd(instancestring) (ip,sshFlagsstring,errerror) {`
`398`	`398`	`dryRunCmd:=fmt.Sprintf("gcloud compute ssh --dry-run %v",instance)`
`399`	`399`
`400`		`-out,err:=exec.Command("sh","-c",dryRunCmd).CombinedOutput()`
	`400`	`+out,err:=exec.Command("sh","-l","-c",dryRunCmd).CombinedOutput()`
`401`	`401`	`iferr!=nil {`
`402`	`402`	`return"","",xerrors.Errorf("%s: %w",out,err)`
`403`	`403`	`}`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ func TestSSHCode(t *testing.T) {`
`48`	`48`	`waitForSSHCode(t,remotePort,time.Second*30)`
`49`	`49`
`50`	`50`	`// Typically we'd do an os.Stat call here but the os package doesn't expand '~'`
`51`		`-out,err:=exec.Command("sh","-c","stat "+codeServerPath).CombinedOutput()`
	`51`	`+out,err:=exec.Command("sh","-l","-c","stat "+codeServerPath).CombinedOutput()`
`52`	`52`	`require.NoError(t,err,"%s",out)`
`53`	`53`
`54`	`54`	`out,err=exec.Command("pkill",filepath.Base(codeServerPath)).CombinedOutput()`
`@@ -200,7 +200,7 @@ func handleSession(ch ssh.Channel, in <-chan ssh.Request, t testing.T) {`
`200`	`200`	`return`
`201`	`201`	`}`
`202`	`202`
`203`		`-cmd:=exec.Command("sh","-c",exReq.Command)`
	`203`	`+cmd:=exec.Command("sh","-l","-c",exReq.Command)`
`204`	`204`
`205`	`205`	`stdin,err:=cmd.StdinPipe()`
`206`	`206`	`require.NoError(t,err)`

Comments

(0)