aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/updater
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2019-05-01 10:14:01 +0200
committerJason A. Donenfeld <Jason@zx2c4.com>2019-05-01 10:14:19 +0200
commit1667f42fbf7b2f6efde9ced34044fd8b16647220 (patch)
treee42f17b7237722ced2d1d6cff5a1c782b7f74c1d /updater
parentinstaller: remove window flash and add logging (diff)
downloadwireguard-windows-1667f42fbf7b2f6efde9ced34044fd8b16647220.tar.xz
wireguard-windows-1667f42fbf7b2f6efde9ced34044fd8b16647220.zip
updater: don't pass full paths to msiexec
Diffstat (limited to 'updater')
-rw-r--r--updater/msirunner_windows.go7
1 files changed, 3 insertions, 4 deletions
diff --git a/updater/msirunner_windows.go b/updater/msirunner_windows.go
index 7a4e9d72..a11ed335 100644
--- a/updater/msirunner_windows.go
+++ b/updater/msirunner_windows.go
@@ -17,10 +17,9 @@ func runMsi(msiPath string) error {
if err != nil {
return err
}
- // BUG: The Go documentation says that its built-in shell quoting isn't good for msiexec.exe.
- // See https://github.com/golang/go/issues/15566. But perhaps our limited set of options
- // actually works fine? Investigate this!
- return exec.Command(path.Join(system32, "msiexec.exe"), "/qb-", "/i", msiPath).Run()
+ cmd := exec.Command(path.Join(system32, "msiexec.exe"), "/qb-", "/i", path.Base(msiPath))
+ cmd.Dir = path.Dir(msiPath)
+ return cmd.Run()
}
func msiSaveDirectory() (string, error) {