mudhorn/oh-my-posh
1
0
Fork 0
mirror of https://github.com/JanDeDobbeleer/oh-my-posh.git synced 2024-11-10 04:54:03 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: correct error printing for eval

Browse source
This commit is contained in:
Jan De Dobbeleer 2021-09-09 20:02:00 +02:00 committed by Jan De Dobbeleer
parent baa97c8b68
commit 13cb9a6a58
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/config.go
View file

@ -46,7 +46,11 @@ const (
DefaultHTTPTimeout = 20
)
func printConfigError(err error) {
func printConfigError(err error, eval bool) {
if eval {
fmt.Println("echo \"Oh My Posh Error:\n\"", err.Error())
return
}
fmt.Println("Oh My Posh Error:\n", err.Error())
}
@ -62,11 +66,12 @@ func GetConfig(env environmentInfo) *Config {
func loadConfig(env environmentInfo) (*Config, error) {
var cfg Config
configFile := *env.getArgs().Config
eval := *env.getArgs().Eval
if configFile == "" {
return nil, errors.New("NO CONFIG")
}
if _, err := os.Stat(configFile); os.IsNotExist(err) {
printConfigError(err)
printConfigError(err, eval)
return nil, errors.New("INVALID CONFIG PATH")
}
@ -81,13 +86,13 @@ func loadConfig(env environmentInfo) (*Config, error) {
err := config.LoadFiles(configFile)
if err != nil {
printConfigError(err)
printConfigError(err, eval)
return nil, errors.New("UNABLE TO OPEN CONFIG")
}
err = config.BindStruct("", &cfg)
if err != nil {
printConfigError(err)
printConfigError(err, eval)
return nil, errors.New("INVALID CONFIG")
}
@ -110,7 +115,7 @@ func exportConfig(configFile, format string) string {
err := config.LoadFiles(configFile)
if err != nil {
printConfigError(err)
printConfigError(err, false)
return fmt.Sprintf("INVALID CONFIG:\n\n%s", err.Error())
}
@ -124,7 +129,7 @@ func exportConfig(configFile, format string) string {
buf := new(bytes.Buffer)
_, err = config.DumpTo(buf, format)
if err != nil {
printConfigError(err)
printConfigError(err, false)
return "UNABLE TO DUMP CONFIG"
}