cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Remove unneeded code, document creates param and ensure creates only affects state=present

Browse source
This commit is contained in:
Matt Martz 2014-06-18 13:32:58 -05:00
parent 5d7f67569f
commit 069fa71d87
2 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
library/windows/win_msi
View file

@ -27,7 +27,8 @@ module: win_msi
version_added: "1.7"
short_description: Installs and uninstalls Windows MSI files
description:
- Installs or uninstalls a Windows MSI file that is already located on the target server
- Installs or uninstalls a Windows MSI file that is already located on the
target server
options:
path:
description:
@ -40,6 +41,10 @@ options:
- present
- absent
default: present
creates:
description:
- Path to a file created by installing the MSI to prevent from
attempting to reinstall the package on every run
author: Matt Martz
'''

10
library/windows/win_msi.ps1
View file

@ -35,7 +35,7 @@ If ($params.extra_args.GetType)
$extra_args = $params.extra_args;
}
If ($params.creates.GetType)
If ($params.creates.GetType -and $params.state.GetType -and $params.state -ne "absent")
{
If (Test-File $creates)
{
@ -44,8 +44,6 @@ If ($params.creates.GetType)
}
$logfile = [IO.Path]::GetTempFileName();
$stdoutfile = [IO.Path]::GetTempFileName();
$stderrfile = [IO.Path]::GetTempFileName();
if ($params.state.GetType -and $params.state -eq "absent")
{
msiexec.exe /x $params.path /qb /l $logfile $extra_args;
@ -59,13 +57,7 @@ Set-Attr $result "changed" $true;
$logcontents = Get-Content $logfile;
Remove-Item $logfile;
$stdoutcontents = Get-Content $stdoutfile;
Remove-Item $stdoutfile;
$stderrcontents = Get-Content $stderrfile;
Remove-Item $stderrfile;
Set-Attr $result "log" $logcontents;
Set-Attr $result "stdout" $stdoutcontents;
Set-Attr $result "stderr" $stderrcontents;
Exit-Json $result;