Merge pull request #12511 from n1hility/fix-win-path

Fixes #11416 - Trailing quote on PATH added by Windows MSI
containers · Dec 6, 2021 · da3d636 · da3d636
2 parents e79c47b + 527fd3c
commit da3d636
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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 &quot;%PATH%;[INSTALLDIR]&quot;" 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 &quot;%PATH%;[INSTALLDIR]\&quot;" Property="setx" Execute="deferred" Impersonate="yes" Return="check"/>
 
     <Feature Id="Complete" Level="1">
       <ComponentRef Id="INSTALLDIR_Component"/>