ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-04-24 19:31:26 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

powershell: display non-ascii characters in command outputs (#37229)

Browse source
This commit is contained in:
Jordan Borean 2018-04-06 07:59:51 +10:00 • committed by Matt Davis
parent fd4d264253
commit 71e8527d7c
6 changed files with 96 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

28
lib/ansible/plugins/shell/powershell.py
View file

@ -1096,6 +1096,27 @@ $exec_wrapper = {
$DebugPreference = "Continue"
$ErrorActionPreference = "Stop"
# become process is run under a different console to the WinRM one so we
# need to set the UTF-8 codepage again
Add-Type -Debug:$false -TypeDefinition @'
using System;
using System.Runtime.InteropServices;
namespace Ansible
{
public class ConsoleCP
{
[DllImport("kernel32.dll")]
public static extern bool SetConsoleCP(UInt32 wCodePageID);
[DllImport("kernel32.dll")]
public static extern bool SetConsoleOutputCP(UInt32 wCodePageID);
}
}
'@
[Ansible.ConsoleCP]::SetConsoleCP(65001) > $null
[Ansible.ConsoleCP]::SetConsoleOutputCP(65001) > $null
Function ConvertTo-HashtableFromPsCustomObject($myPsObject) {
$output = @{}
$myPsObject | Get-Member -MemberType *Property | % {
@ -1142,8 +1163,8 @@ $exec_wrapper = {
}
$output = $entrypoint.Run($payload)
Write-Output $output
# base64 encode the output so the non-ascii characters are preserved
Write-Output ([System.Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes((Write-Output $output))))
} # end exec_wrapper
Function Dump-Error ($excep) {
@ -1262,10 +1283,11 @@ Function Run($payload) {
$result = [Ansible.BecomeUtil]::RunAsUser($username, $password, $lp_command_line, $lp_current_directory, $payload_string, $logon_flags, $logon_type)
$stdout = $result.StandardOut
$stdout = [System.Text.Encoding]::UTF8.GetString([System.Convert]::FromBase64String($stdout.Trim()))
$stderr = $result.StandardError
$rc = $result.ExitCode
[Console]::Out.WriteLine($stdout.Trim())
[Console]::Out.WriteLine($stdout)
[Console]::Error.WriteLine($stderr.Trim())
} Catch {
$excep = $_