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

use convertto-bool for rm and recurse params

Browse source
This commit is contained in:
Phil 2015-07-06 09:59:51 -05:00 committed by Matt Clay
parent 2d1189dee8
commit 01b36130a8
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -62,16 +62,15 @@ Else {
Fail-Json $result "missing required argument: dest" Fail-Json $result "missing required argument: dest"
} }
If ($params.recurse -eq "true" -Or $params.recurse -eq "yes") { If ($params.recurse) {
$recurse = $true $recurse = ConvertTo-Bool ($params.recurse)
} }
Else { Else {
$recurse = $false $recurse = $false
} }
If ($params.rm -eq "true" -Or $params.rm -eq "yes"){ If ($params.rm) {
$rm = $true $rm = ConvertTo-Bool ($params.rm)
Set-Attr $result.win_unzip "rm" "true"
} }
Else { Else {
$rm = $false $rm = $false
@ -111,7 +110,7 @@ Else {
If ($recurse) { If ($recurse) {
Expand-Archive -Path $src -OutputPath $dest -Force Expand-Archive -Path $src -OutputPath $dest -Force
If ($rm) { If ($rm -eq $true) {
Get-ChildItem $dest -recurse | Where {$_.extension -eq ".gz" -Or $_.extension -eq ".zip" -Or $_.extension -eq ".bz2" -Or $_.extension -eq ".tar" -Or $_.extension -eq ".msu"} | % { Get-ChildItem $dest -recurse | Where {$_.extension -eq ".gz" -Or $_.extension -eq ".zip" -Or $_.extension -eq ".bz2" -Or $_.extension -eq ".tar" -Or $_.extension -eq ".msu"} | % {
Expand-Archive $_.FullName -OutputPath $dest -Force Expand-Archive $_.FullName -OutputPath $dest -Force
Remove-Item $_.FullName -Force Remove-Item $_.FullName -Force