Skip to content

Commit

Permalink
fix: correct error printing for eval
Browse files Browse the repository at this point in the history
  • Loading branch information
JanDeDobbeleer committed Sep 9, 2021
1 parent baa97c8 commit 13cb9a6
Showing 1 changed file with 11 additions and 6 deletions.
17 changes: 11 additions & 6 deletions src/config.go
Expand Up @@ -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())
}

Expand All @@ -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")
}

Expand All @@ -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")
}

Expand All @@ -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())
}

Expand All @@ -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"
}

Expand Down

0 comments on commit 13cb9a6

Please sign in to comment.