Skip to content

Commit e41d8b5

Browse files
committed
add back 2 version commands fix version handling
1 parent 0790e1e commit e41d8b5

1 file changed

Lines changed: 12 additions & 5 deletions

File tree

pkg/version/version.go

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,24 @@ import (
1414

1515
var (
1616
RegexVersionNumber = regexp.MustCompile(`(?m)[v\s](\d+\.\d+\.\d+)`)
17-
versionCmd = "--version"
17+
versionCommands = []string{"--version", "version"}
1818
)
1919

2020
func ExtractInstalledVersion(tool types.Tool, basePath string) (string, error) {
2121
toolPath := filepath.Join(basePath, tool.Name)
2222

23-
version, err := tryVersionCommand(toolPath, versionCmd)
24-
if err != nil {
25-
return "", err
23+
var lastErr error
24+
25+
for _, versionCmd := range versionCommands {
26+
version, err := tryVersionCommand(toolPath, versionCmd)
27+
if err == nil {
28+
return version, nil
29+
}
30+
31+
lastErr = err
2632
}
27-
return version, nil
33+
34+
return "", lastErr
2835
}
2936

3037
func tryVersionCommand(toolPath, versionCmd string) (string, error) {

0 commit comments

Comments
 (0)