summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-08-12 13:06:02 -0400
committerGitHub <noreply@github.com>2020-08-12 13:06:02 -0400
commitbb3eceae56821903f6c51bebf77e5ef425868918 (patch)
tree25d836502f83a079461c17fdc14a5c90621a7fbf /contrib
parent73fa527ae1f83b3db025e361d73bb7966ef69626 (diff)
parent6ff42395d08217d86055456a9130fef8f78d34e2 (diff)
downloadpodman-bb3eceae56821903f6c51bebf77e5ef425868918.tar.gz
podman-bb3eceae56821903f6c51bebf77e5ef425868918.tar.bz2
podman-bb3eceae56821903f6c51bebf77e5ef425868918.zip
Merge pull request #7295 from baude/msiremotefixes
podman-remote fixes for msi and client
Diffstat (limited to 'contrib')
-rw-r--r--contrib/msi/podman.wxs5
1 files changed, 2 insertions, 3 deletions
diff --git a/contrib/msi/podman.wxs b/contrib/msi/podman.wxs
index c2c2cea4f..ff8160a53 100644
--- a/contrib/msi/podman.wxs
+++ b/contrib/msi/podman.wxs
@@ -24,8 +24,7 @@
<CreateFolder/>
</Component>
<Component Id="MainExecutable" Guid="73752F94-6589-4C7B-ABED-39D655A19714">
- <File Id="520C6E17-77A2-4F41-9611-30FA763A0702" Name="podman-remote-windows.exe" Source="bin/podman-remote-windows.exe"/>
- <File Id="A14218A0-4180-44AC-B109-7C63B3099DCA" Name="podman.bat" Source="podman.bat" KeyPath="yes"/>
+ <File Id="520C6E17-77A2-4F41-9611-30FA763A0702" Name="podman.exe" Source="bin/podman-remote-windows.exe" KeyPath="yes"/>
</Component>
</Directory>
</Directory>
@@ -33,7 +32,7 @@
</Directory>
<Property Id="setx" Value="setx.exe"/>
- <CustomAction Id="ChangePath" ExeCommand="PATH &quot;%PATH%;[INSTALLDIR] &quot;" Property="setx" Execute="deferred" Impersonate="yes" Return="check"/>
+ <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"/>