diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-02-03 06:57:07 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-03 06:57:07 -0800 |
| commit | 23f795786224c27f737e9043e9d513f54fa35ba8 (patch) | |
| tree | 2bd4df926e08a9bf8ba60fd1b5b4a66c2d36245b | |
| parent | 5e7d6e52dd8ac8f7e213cde7b98f270c77608523 (diff) | |
| parent | b9770484365084a3ccf8744b05eb7f437626006c (diff) | |
| download | podman-23f795786224c27f737e9043e9d513f54fa35ba8.tar.gz podman-23f795786224c27f737e9043e9d513f54fa35ba8.tar.bz2 podman-23f795786224c27f737e9043e9d513f54fa35ba8.zip | |
Merge pull request #5044 from jwhonce/issues/4335
Update XML to not embed quote in PATH on windows
| -rw-r--r-- | contrib/msi/podman.wxs | 2 | ||||
| -rw-r--r-- | docs/links-to-html.lua | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/contrib/msi/podman.wxs b/contrib/msi/podman.wxs index ec62a93c5..c2c2cea4f 100644 --- a/contrib/msi/podman.wxs +++ b/contrib/msi/podman.wxs @@ -33,7 +33,7 @@ </Directory> <Property Id="setx" Value="setx.exe"/> - <CustomAction Id="ChangePath" ExeCommand='PATH "%PATH%;[INSTALLDIR]"' Property="setx" Execute="deferred" Impersonate="yes" Return="check"/> + <CustomAction Id="ChangePath" ExeCommand="PATH "%PATH%;[INSTALLDIR] "" Property="setx" Execute="deferred" Impersonate="yes" Return="check"/> <Feature Id="Complete" Level="1"> <ComponentRef Id="INSTALLDIR_Component"/> diff --git a/docs/links-to-html.lua b/docs/links-to-html.lua index 74072a9e4..816c43353 100644 --- a/docs/links-to-html.lua +++ b/docs/links-to-html.lua @@ -1,4 +1,3 @@ -# links-to-html.lua function Link(el) el.target = string.gsub(el.target, "%.1.md", ".html") return el |