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

Made Powershell Strict Complient

Browse source
This commit is contained in:
Corwin Brown 2015-10-09 17:49:34 -05:00 committed by Matt Clay
parent e0e45bd383
commit 34ff61e24f
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
lib/ansible/modules/extras/windows/win_unzip.ps1
View file

@ -26,14 +26,14 @@ $result = New-Object psobject @{
changed = $false changed = $false
} }
If ($params.creates) { If (Get-Member -InputObject $params -Name creates) {
If (Test-Path $params.creates) { If (Test-Path $params.creates) {
Exit-Json $result "The 'creates' file or directory already exists." Exit-Json $result "The 'creates' file or directory already exists."
} }
} }
If ($params.src) { If (Get-Member -InputObject $params -Name src) {
$src = $params.src.toString() $src = $params.src.toString()
If (-Not (Test-Path -path $src)){ If (-Not (Test-Path -path $src)){
@ -62,24 +62,26 @@ Else {
Fail-Json $result "missing required argument: dest" Fail-Json $result "missing required argument: dest"
} }
If ($params.recurse) { If (Get-Member -InputObject $params -Name recurse) {
$recurse = ConvertTo-Bool ($params.recurse) $recurse = ConvertTo-Bool ($params.recurse)
} }
Else { Else {
$recurse = $false $recurse = $false
} }
If ($params.rm) { If (Get-Member -InputObject $params -Name rm) {
$rm = ConvertTo-Bool ($params.rm) $rm = ConvertTo-Bool ($params.rm)
} }
Else { Else {
$rm = $false $rm = $false
} }
If ($ext -eq ".zip" -And $recurse -eq $false) { If ($ext -eq ".zip" -And $recurse -eq $false) {
Try { Try {
$shell = New-Object -ComObject Shell.Application $shell = New-Object -ComObject Shell.Application
$shell.NameSpace($dest).copyhere(($shell.NameSpace($src)).items(), 20) $zipPkg = $shell.NameSpace($src)
$destPath = $shell.NameSpace($dest)
$destPath.CopyHere($zipPkg.Items())
$result.changed = $true $result.changed = $true
} }
Catch { Catch {
@ -154,4 +156,4 @@ Set-Attr $result.win_unzip "src" $src.toString()
Set-Attr $result.win_unzip "dest" $dest.toString() Set-Attr $result.win_unzip "dest" $dest.toString()
Set-Attr $result.win_unzip "recurse" $recurse.toString() Set-Attr $result.win_unzip "recurse" $recurse.toString()
Exit-Json $result; Exit-Json $result;