haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #3803 from mitchellh/issue-3729 

guests/windows: change elevated shell output to better get output
This commit is contained in:
Mitchell Hashimoto 2014-05-15 09:37:00 -07:00
parent 3fb7b5061e 823e80fa32
commit 5899227126
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
plugins/communicators/winrm/scripts/elevated_shell.ps1.erb
View File

@ -71,25 +71,23 @@ while ( (!($registered_task.state -eq 4)) -and ($sec -lt $timeout) ) {
$sec++ $sec++
} }
# Read the entire file, but only write out new lines we haven't seen before function SlurpOutput($out_file, $cur_line) {
$numLinesRead = 0
do {
Start-Sleep -m 100
if (Test-Path $out_file) { if (Test-Path $out_file) {
$text = (get-content $out_file) get-content $out_file | select -skip $cur_line | ForEach {
$numLines = ($text | Measure-Object -line).lines $cur_line += 1
$numLinesToRead = $numLines - $numLinesRead
if ($numLinesToRead -gt 0) {
$text | select -first $numLinesToRead -skip $numLinesRead | ForEach {
Write-Host "$_" Write-Host "$_"
} }
$numLinesRead += $numLinesToRead
} }
return $cur_line
} }
$cur_line = 0
do {
Start-Sleep -m 100
$cur_line = SlurpOutput $out_file $cur_line
} while (!($registered_task.state -eq 3)) } while (!($registered_task.state -eq 3))
$exit_code = $registered_task.LastTaskResult $exit_code = $registered_task.LastTaskResult
[System.Runtime.Interopservices.Marshal]::ReleaseComObject($schedule) | Out-Null [System.Runtime.Interopservices.Marshal]::ReleaseComObject($schedule) | Out-Null
exit $exit_code exit $exit_code