Skip to content

Commit 9c37af6

Browse files
authored
Merge pull request #965 from nineninesevenfour/fix-932-path-with-spaces
fix issue #932
2 parents a73ef54 + 6c175fa commit 9c37af6

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

src/nvm.go

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1182,16 +1182,19 @@ func updateRootDir(path string) {
11821182
}
11831183

11841184
func elevatedRun(name string, arg ...string) (bool, error) {
1185-
ok, err := run("cmd", append([]string{"/C", name}, arg...)...)
1185+
ok, err := run("cmd", nil, append([]string{"/C", name}, arg...)...)
11861186
if err != nil {
1187-
ok, err = run(filepath.Join(env.root, "elevate.cmd"), append([]string{"cmd", "/C", name}, arg...)...)
1187+
ok, err = run("elevate.cmd", &env.root, append([]string{"cmd", "/C", name}, arg...)...)
11881188
}
11891189

11901190
return ok, err
11911191
}
11921192

1193-
func run(name string, arg ...string) (bool, error) {
1193+
func run(name string, dir *string, arg ...string) (bool, error) {
11941194
c := exec.Command(name, arg...)
1195+
if dir != nil {
1196+
c.Dir = *dir
1197+
}
11951198
var stderr bytes.Buffer
11961199
c.Stderr = &stderr
11971200
err := c.Run()

0 commit comments

Comments
 (0)