diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-12-06 09:13:24 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-06 09:13:24 +0000 |
| commit | da3d63615e17dfa87dc875d23b059e02c32b5ff6 (patch) | |
| tree | 14f741be8a3c33cb664692e269651f9f2b28ed2f | |
| parent | e79c47bc0c0d68faebc2e38a97dbb5d0654342d3 (diff) | |
| parent | 527fd3c0faf24b97e22e2b0de9eb66b687ec220b (diff) | |
| download | podman-da3d63615e17dfa87dc875d23b059e02c32b5ff6.tar.gz podman-da3d63615e17dfa87dc875d23b059e02c32b5ff6.tar.bz2 podman-da3d63615e17dfa87dc875d23b059e02c32b5ff6.zip | |
Merge pull request #12511 from n1hility/fix-win-path
Fixes #11416 - Trailing quote on PATH added by Windows MSI
| -rw-r--r-- | contrib/msi/podman.wxs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/contrib/msi/podman.wxs b/contrib/msi/podman.wxs index 4136e2cc4..aade2afdb 100644 --- a/contrib/msi/podman.wxs +++ b/contrib/msi/podman.wxs @@ -32,7 +32,8 @@ </Directory> <Property Id="setx" Value="setx.exe"/> - <CustomAction Id="ChangePath" ExeCommand="PATH "%PATH%;[INSTALLDIR]"" Property="setx" Execute="deferred" Impersonate="yes" Return="check"/> + <!-- Directory table entries have a trailing slash, so an extra backslash is needed to prevent escaping the quote --> + <CustomAction Id="ChangePath" ExeCommand="PATH "%PATH%;[INSTALLDIR]\"" Property="setx" Execute="deferred" Impersonate="yes" Return="check"/> <Feature Id="Complete" Level="1"> <ComponentRef Id="INSTALLDIR_Component"/> |