extern/starship
1
0
Fork 0
mirror of https://github.com/starship/starship.git synced 2024-11-29 19:53:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(pwsh): fix crash on error in shell with old pwsh (#1861)

Browse Source 
Handle missing Get-Error in powershell gracefully.
This commit is contained in:
David Knaack 2020-11-12 17:42:03 +01:00 committed by GitHub
parent d648bb0e00
commit a05be18447
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/init/starship.ps1
View File

@ -19,12 +19,12 @@ function global:prompt {
[Console]::OutputEncoding = [System.Text.Encoding]::UTF8 [Console]::OutputEncoding = [System.Text.Encoding]::UTF8
if ($lastCmd = Get-History -Count 1) { if ($lastCmd = Get-History -Count 1) {
# In case we have a False on the Dollar hook, we know there's an error. # In case we have a False on the Dollar hook, we know there's an error.
if( -not $origDollarQuestion){ if (-not $origDollarQuestion) {
# We retrieve the InvocationInfo from the most recent error. # We retrieve the InvocationInfo from the most recent error.
$lastCmdletError = Get-Error | Where-Object {$_ -ne $null} | Select-Object -expand InvocationInfo $lastCmdletError = try { Get-Error | Where-Object { $_ -ne $null } | Select-Object -expand InvocationInfo } catch { $null }
# We check if the las command executed matches the line that caused the last error , in which case we know # We check if the las command executed matches the line that caused the last error , in which case we know
# it was an internal Powershell command, otherwise, there MUST be an error code. # it was an internal Powershell command, otherwise, there MUST be an error code.
$lastExitCodeForPrompt = if($lastCmd.CommandLine -eq $lastCmdletError.Line){1} else {$origLastExitCode} $lastExitCodeForPrompt = if ($null -ne $lastCmdletError -and $lastCmd.CommandLine -eq $lastCmdletError.Line) { 1 } else { $origLastExitCode }
} }
$duration = [math]::Round(($lastCmd.EndExecutionTime - $lastCmd.StartExecutionTime).TotalMilliseconds) $duration = [math]::Round(($lastCmd.EndExecutionTime - $lastCmd.StartExecutionTime).TotalMilliseconds)