Commit7d34771

authored

refactor: use constants for OSs (#448)

1 parent582f213 commit7d34771Copy full SHA for 7d34771

File tree

-3

lines changed

-3

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@ func binPath() (string, error) {`
`160`	`160`	`// Bash and OpenSSH for Windows (used by Powershell and VS Code) to function`
`161`	`161`	`// correctly. Check if the current executable is in $PATH, and warn the user`
`162`	`162`	`// if it isn't.`
`163`		`-ifruntime.GOOS=="windows" {`
	`163`	`+ifruntime.GOOS==goosWindows {`
`164`	`164`	`binName:=filepath.Base(exePath)`
`165`	`165`
`166`	`166`	`// We use safeexec instead of os/exec because os/exec returns paths in`
`@@ -268,7 +268,7 @@ func makeSSHConfig(binPath, workspaceName, privateKeyFilepath string, additional`
`268`	`268`	`fmt.Sprintf("IdentityFile=%q",privateKeyFilepath),`
`269`	`269`	`)`
`270`	`270`
`271`		`-ifruntime.GOOS=="linux"\|\|runtime.GOOS=="darwin" {`
	`271`	`+ifruntime.GOOS==goosLinux\|\|runtime.GOOS==goosDarwin {`
`272`	`272`	`options=append(options,`
`273`	`273`	`"ControlMaster auto",`
`274`	`274`	`"ControlPath ~/.ssh/.connection-%r@%h:%p",`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@ import (`
`36`	`36`	`const (`
`37`	`37`	`goosWindows="windows"`
`38`	`38`	`goosLinux="linux"`
	`39`	`+goosDarwin="darwin"`
`39`	`40`	`apiPrivateVersion="/api/private/version"`
`40`	`41`	`)`
`41`	`42`
`@@ -181,7 +182,7 @@ func (u *updater) Run(ctx context.Context, force bool, coderURLArg string, versi`
`181`	`182`	`// TODO: validate the checksum of the downloaded file. GitHub does not currently provide this information`
`182`	`183`	`// and we do not generate them yet.`
`183`	`184`	`varupdatedBinaryNamestring`
`184`		`-ifu.osF()=="windows" {`
	`185`	`+ifu.osF()==goosWindows {`
`185`	`186`	`updatedBinaryName="coder.exe"`
`186`	`187`	`}else {`
`187`	`188`	`updatedBinaryName="coder"`

Comments

(0)