Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4262 from thaJeztah/no_lookpath 

cli/config/credentials: skip unneeded exec.LookPath()
This commit is contained in:
Sebastiaan van Stijn 2023-05-16 18:10:50 +01:00 committed by GitHub
parent 935df5a59f ce11b28d83
commit 761d973656
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
cli/config/credentials/default_store.go
View File

@ -5,17 +5,20 @@ import (
) )
// DetectDefaultStore return the default credentials store for the platform if // DetectDefaultStore return the default credentials store for the platform if
// the store executable is available. // no user-defined store is passed, and the store executable is available.
func DetectDefaultStore(store string) string { func DetectDefaultStore(store string) string {
platformDefault := defaultCredentialsStore() if store != "" {
// use user-defined
// user defined or no default for platform
if store != "" || platformDefault == "" {
return store return store
} }
if _, err := exec.LookPath(remoteCredentialsPrefix + platformDefault); err == nil { platformDefault := defaultCredentialsStore()
return platformDefault if platformDefault == "" {
return ""
} }
return ""
if _, err := exec.LookPath(remoteCredentialsPrefix + platformDefault); err != nil {
return ""
}
return platformDefault
} }