Commit4a7aca7

committed

Use safeexec to get windows path

1 parent74b7fa4 commit4a7aca7Copy full SHA for 4a7aca7

File tree

-4

lines changed

-4

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ require (`
`6`	`6`	`cdr.dev/slogv1.4.1`
`7`	`7`	`cdr.dev/wsepv0.0.0-20200728013649-82316a09813f`
`8`	`8`	`github.com/briandowns/spinnerv1.16.0`
	`9`	`+github.com/cli/safeexecv1.0.0`
`9`	`10`	`github.com/fatih/colorv1.12.0`
`10`	`11`	`github.com/google/go-cmpv0.5.6`
`11`	`12`	`github.com/gorilla/websocketv1.4.2`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -78,6 +78,8 @@ github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e h1:fY5BOSpyZCqRo5O`
`78`	`78`	`github.com/chzyer/readlinev0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=`
`79`	`79`	`github.com/chzyer/testv0.0.0-20180213035817-a1ea475d72b1 h1:q763qf9huN11kDQavWsoZXJNW3xEE4JJyHa5Q25/sd8=`
`80`	`80`	`github.com/chzyer/testv0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=`
	`81`	`+github.com/cli/safeexecv1.0.0 h1:0VngyaIyqACHdcMNWfo6+KdUYnqEr2Sg+bSP1pdF+dI=`
	`82`	`+github.com/cli/safeexecv1.0.0/go.mod h1:Z/D4tTN8Vs5gXYHDCbaM1S/anmEDnJb1iW0+EJ5zx3Q=`
`81`	`83`	`github.com/client9/misspellv0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=`
`82`	`84`	`github.com/cncf/udpa/gov0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=`
`83`	`85`	`github.com/cncf/udpa/gov0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=`

Lines changed: 6 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,20 +6,19 @@ import (`
`6`	`6`	`"io/ioutil"`
`7`	`7`	`"net/url"`
`8`	`8`	`"os"`
`9`		`-"os/exec"`
`10`	`9`	`"os/user"`
`11`	`10`	`"path/filepath"`
`12`	`11`	`"runtime"`
`13`	`12`	`"sort"`
`14`	`13`	`"strings"`
`15`	`14`
`16`		`-"cdr.dev/coder-cli/pkg/clog"`
`17`		`-`
	`15`	`+"github.com/cli/safeexec"`
`18`	`16`	`"github.com/spf13/cobra"`
`19`	`17`	`"golang.org/x/xerrors"`
`20`	`18`
`21`	`19`	`"cdr.dev/coder-cli/coder-sdk"`
`22`	`20`	`"cdr.dev/coder-cli/internal/coderutil"`
	`21`	`+"cdr.dev/coder-cli/pkg/clog"`
`23`	`22`	`)`
`24`	`23`
`25`	`24`	`constsshStartToken="# ------------START-CODER-ENTERPRISE-----------"`
`@@ -162,7 +161,10 @@ func binPath() (string, error) {`
`162`	`161`	`// if it isn't.`
`163`	`162`	`ifruntime.GOOS=="windows" {`
`164`	`163`	`binName:=filepath.Base(exePath)`
`165`		`-pathPath,err:=exec.LookPath(exePath)`
	`164`	`+// We use safeexec instead of os/exec because os/exec returns paths in`
	`165`	`+// the current working directory, which we will run into very often when`
	`166`	`+// looking for our own path.`
	`167`	`+pathPath,err:=safeexec.LookPath(binName)`
`166`	`168`	`iferr!=nil {`
`167`	`169`	`clog.LogWarn(`
`168`	`170`	`"The current executable is not in $PATH.",`

Comments

(0)