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

fix(pyenv): identify shims correctly
Some checks failed
Azure Static Web Apps CI/CD / Build and Deploy (push) Has been cancelled
Details
Release / changelog (push) Has been cancelled
Details
Release / artifacts (push) Has been cancelled
Details
Release / msi (arm64) (push) Has been cancelled
Details
Release / msi (x64) (push) Has been cancelled
Details
Release / msi (x86) (push) Has been cancelled
Details
Release / release (push) Has been cancelled
Details

Browse source
This commit is contained in:
Jan De Dobbeleer 2025-03-04 07:40:19 +01:00 committed by Jan De Dobbeleer
parent 58670c5a80
commit a66586da69
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/segments/language.go
View file

@ -222,12 +222,14 @@ func (l *language) setVersion() error {
for _, command := range l.commands { for _, command := range l.commands {
versionStr, err := l.runCommand(command) versionStr, err := l.runCommand(command)
if err != nil { if err != nil {
log.Error(err)
lastError = err lastError = err
continue continue
} }
version, err := command.parse(versionStr) version, err := command.parse(versionStr)
if err != nil { if err != nil {
log.Error(err)
lastError = fmt.Errorf("err parsing info from %s with %s", command.executable, versionStr) lastError = fmt.Errorf("err parsing info from %s with %s", command.executable, versionStr)
continue continue
} }
@ -271,8 +273,12 @@ func (l *language) runCommand(command *cmd) (string, error) {
} }
versionStr, err := command.getVersion() versionStr, err := command.getVersion()
if err != nil || versionStr == "" { if err != nil {
return "", errors.New("cannot get version") return "", err
}
if len(versionStr) == 0 {
return "", errors.New("no version found")
} }
return versionStr, nil return versionStr, nil

3
src/segments/python.go
View file

@ -138,8 +138,7 @@ func (p *Python) pyenvVersion() (string, error) {
} }
pyEnvRoot := p.env.Getenv("PYENV_ROOT") pyEnvRoot := p.env.Getenv("PYENV_ROOT")
// TODO: pyenv-win has this at $PYENV_ROOT/pyenv-win/shims if !strings.HasPrefix(cmdPath, pyEnvRoot) {
if cmdPath != filepath.Join(pyEnvRoot, "shims", "python") {
return "", fmt.Errorf("executable at %s is not a pyenv shim", cmdPath) return "", fmt.Errorf("executable at %s is not a pyenv shim", cmdPath)
} }