Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Master #62626

Merged
merged 3 commits into from
Sep 20, 2019
Merged

Master #62626

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cd4da7d
Update win_package.ps1
richardsonky Sep 18, 2019
64abdf9
Update win_package.ps1
richardsonky Sep 18, 2019
481d27e
added literal path to get-itemproperty
richardsonky Sep 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
24 changes: 12 additions & 12 deletions lib/ansible/modules/windows/win_package.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ Function Test-RegistryProperty($path, $name) {
# will validate if the registry key contains the property, returns true
# if the property exists and false if the property does not
try {
$value = (Get-Item -Path $path).GetValue($name)
$value = (Get-Item -LiteralPath $path).GetValue($name)
# need to do it this way return ($null -eq $value) does not work
if ($null -eq $value) {
return $false
Expand Down Expand Up @@ -193,13 +193,13 @@ Function Get-ProgramMetadata($state, $path, $product_id, [PSCredential]$credenti
$test_path = $path
}

$valid_path = Test-Path -Path $test_path -PathType Leaf
$valid_path = Test-Path -LiteralPath $test_path -PathType Leaf
if ($valid_path -ne $true) {
$metadata.path_error = "the file at the UNC path $path cannot be reached, ensure the user_name account has access to this path or use an auth transport with credential delegation"
}
} else {
$metadata.location_type = [LocationType]::Local
$valid_path = Test-Path -Path $path -PathType Leaf
$valid_path = Test-Path -LiteralPath $path -PathType Leaf
if ($valid_path -ne $true) {
$metadata.path_error = "the file at the local path $path cannot be reached"
}
Expand Down Expand Up @@ -230,17 +230,17 @@ Function Get-ProgramMetadata($state, $path, $product_id, [PSCredential]$credenti
if ($null -ne $metadata.product_id) {
$uninstall_key = "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$($metadata.product_id)"
$uninstall_key_wow64 = "HKLM:\SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\$($metadata.product_id)"
if (Test-Path -Path $uninstall_key) {
if (Test-Path -LiteralPath $uninstall_key) {
$metadata.installed = $true
} elseif (Test-Path -Path $uninstall_key_wow64) {
} elseif (Test-Path -LiteralPath $uninstall_key_wow64) {
$metadata.installed = $true
$uninstall_key = $uninstall_key_wow64
}

# if the reg key exists, try and get the uninstall string and check if it is an MSI
if ($metadata.installed -eq $true -and $metadata.location_type -eq [LocationType]::Empty) {
if (Test-RegistryProperty -path $uninstall_key -name "UninstallString") {
$metadata.uninstall_string = (Get-ItemProperty -Path $uninstall_key -Name "UninstallString").UninstallString
$metadata.uninstall_string = (Get-ItemProperty -LiteralPath $uninstall_key -Name "UninstallString").UninstallString
if ($metadata.uninstall_string.StartsWith("MsiExec")) {
$metadata.msi = $true
}
Expand All @@ -250,11 +250,11 @@ Function Get-ProgramMetadata($state, $path, $product_id, [PSCredential]$credenti

# use the creates_* to determine if the program is installed
if ($null -ne $creates_path) {
$path_exists = Test-Path -Path $creates_path
$path_exists = Test-Path -LiteralPath $creates_path
$metadata.installed = $path_exists

if ($null -ne $creates_version -and $path_exists -eq $true) {
if (Test-Path -Path $creates_path -PathType Leaf) {
if (Test-Path -LiteralPath $creates_path -PathType Leaf) {
$existing_version = [System.Diagnostics.FileVersionInfo]::GetVersionInfo($creates_path).FileVersion
$version_matched = $creates_version -eq $existing_version
$metadata.installed = $version_matched
Expand Down Expand Up @@ -363,7 +363,7 @@ if ($state -eq "absent") {
Fail-Json -obj $result -message "failed to run uninstall process ($($command_args['command'])): $($_.Exception.Message)"
}

if (($null -ne $log_path) -and (Test-Path -Path $log_path)) {
if (($null -ne $log_path) -and (Test-Path -LiteralPath $log_path)) {
$log_content = Get-Content -Path $log_path | Out-String
} else {
$log_content = $null
Expand All @@ -388,7 +388,7 @@ if ($state -eq "absent") {
} finally {
# make sure we cleanup any remaining artifacts
foreach ($cleanup_artifact in $cleanup_artifacts) {
if (Test-Path -Path $cleanup_artifact) {
if (Test-Path -LiteralPath $cleanup_artifact) {
Remove-Item -Path $cleanup_artifact -Recurse -Force -WhatIf:$check_mode
}
}
Expand Down Expand Up @@ -451,7 +451,7 @@ if ($state -eq "absent") {
Fail-Json -obj $result -message "failed to run install process ($($command_args['command'])): $($_.Exception.Message)"
}

if (($null -ne $log_path) -and (Test-Path -Path $log_path)) {
if (($null -ne $log_path) -and (Test-Path -LiteralPath $log_path)) {
$log_content = Get-Content -Path $log_path | Out-String
} else {
$log_content = $null
Expand All @@ -476,7 +476,7 @@ if ($state -eq "absent") {
} finally {
# make sure we cleanup any remaining artifacts
foreach ($cleanup_artifact in $cleanup_artifacts) {
if (Test-Path -Path $cleanup_artifact) {
if (Test-Path -LiteralPath $cleanup_artifact) {
Remove-Item -Path $cleanup_artifact -Recurse -Force -WhatIf:$check_mode
}
}
Expand Down