diff options
| author | Jhon Honce <jhonce@redhat.com> | 2019-09-16 09:23:57 -0700 |
|---|---|---|
| committer | Jhon Honce <jhonce@redhat.com> | 2019-09-19 14:14:38 -0700 |
| commit | 96bcf8cecc92c70cdb86ee288eb57795ef6395e7 (patch) | |
| tree | 5dc7417b2e7c583ed7f9ddac3311d8d17c7b9558 /contrib | |
| parent | 408f2780a1dd94f99fe36be4573a9887e6c74cf7 (diff) | |
| download | podman-96bcf8cecc92c70cdb86ee288eb57795ef6395e7.tar.gz podman-96bcf8cecc92c70cdb86ee288eb57795ef6395e7.tar.bz2 podman-96bcf8cecc92c70cdb86ee288eb57795ef6395e7.zip | |
Support podman-remote help on windows
* Update scipts to produce darwin and windows output
* Update batch file to re-direct help requests to browser
* Add pandoc filter for markdown to html links
Signed-off-by: Jhon Honce <jhonce@redhat.com>
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/msi/podman.bat | 25 | ||||
| -rw-r--r-- | contrib/msi/podman.wxs | 5 |
2 files changed, 30 insertions, 0 deletions
diff --git a/contrib/msi/podman.bat b/contrib/msi/podman.bat index 091c1c4c4..e0c7e1137 100644 --- a/contrib/msi/podman.bat +++ b/contrib/msi/podman.bat @@ -3,6 +3,14 @@ setlocal enableextensions title Podman +if "%1" EQU "" ( + goto run_help +) + +if "%1" EQU "/?" ( + goto run_help +) + :: If remote-host is given on command line -- use it setlocal enabledelayedexpansion for %%a in (%*) do ( @@ -39,5 +47,22 @@ set /p user="Please enter the remote user name: " :run_podman endlocal podman-remote-windows.exe %* +goto end + +:run_help +set run=start "Podman Help" /D "%~dp0" /B + +if not "%3" == "" ( + %run% "podman-%2-%3.html + goto end +) + +if not "%2" == "" ( + %run% "podman-%2.html + goto end +) + +%run% "%podman-remote.html" +goto end :End diff --git a/contrib/msi/podman.wxs b/contrib/msi/podman.wxs index 77c6e2815..ec62a93c5 100644 --- a/contrib/msi/podman.wxs +++ b/contrib/msi/podman.wxs @@ -5,6 +5,10 @@ <?error VERSION must be defined via command line argument?> <?endif?> + <?ifndef var.ManSourceDir?> + <?define ManSourceDir = "bin/windows" ?> + <?endif?> + <Product Name="Podman $(var.VERSION)" Id="*" UpgradeCode="696BAB5D-CA1F-4B05-B123-320F245B8D6D" Version="$(var.VERSION)" Language="1033" Manufacturer="Red Hat Inc."> <Package Id="*" Keywords="Installer" Description="Red Hat's Podman $(var.VERSION) Installer" Comments="Apache 2.0 License" Manufacturer="Red Hat Inc." InstallScope="perMachine" InstallerVersion="100" Compressed="yes"/> @@ -34,6 +38,7 @@ <Feature Id="Complete" Level="1"> <ComponentRef Id="INSTALLDIR_Component"/> <ComponentRef Id="MainExecutable"/> + <ComponentGroupRef Id="ManFiles"/> </Feature> <Icon Id="podman.ico" SourceFile="contrib/msi/podman-logo.ico"/> |