mudhorn/oh-my-posh
1
0
Fork 0
mirror of https://github.com/JanDeDobbeleer/oh-my-posh.git synced 2025-02-02 05:41:10 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: convert exitErr to commandError if runCommand fails

Browse source 
exitError must not exit the runCommand helper, only commandError
safety check when casting in segment_language
This commit is contained in:
lnu 2021-01-14 21:41:05 +01:00 committed by Jan De Dobbeleer
parent f8b28f01ba
commit 31c77af58f
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/environment.go
View file

@ -170,7 +170,12 @@ func (env *environment) runCommand(command string, args ...string) (string, erro
}
out, err := exec.Command(command, args...).Output()
if err != nil {
return "", err
if exitErr, ok := err.(*exec.ExitError); ok {
return "", &commandError{
err: exitErr.Error(),
exitCode: exitErr.ExitCode(),
}
}
}
return strings.TrimSpace(string(out)), nil
}

5
src/segment_language.go
View file

@ -77,9 +77,10 @@ func (l *language) getVersion() bool {
l.exitCode = 0
l.version = values["version"]
} else {
errors.As(err, &exerr)
l.exitCode = exerr.exitCode
l.version = ""
if errors.As(err, &exerr) {
l.exitCode = exerr.exitCode
}
}
return true
}