From 1ff60bbc7429e8cf546ce536a14a930a4e23ff7f Mon Sep 17 00:00:00 2001 From: Joscha Alisch Date: Fri, 7 Feb 2020 19:14:12 +0100 Subject: [PATCH 1/2] Don't segfault on empty aliases and silence warning --- internal/config/alias.go | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/internal/config/alias.go b/internal/config/alias.go index ff8075da..dd22e22c 100644 --- a/internal/config/alias.go +++ b/internal/config/alias.go @@ -2,6 +2,7 @@ package config import ( "io/ioutil" + "os" "path/filepath" "sync" @@ -87,6 +88,12 @@ func (a *Aliases) loadDefaults() { // Load K9s aliases. func (a *Aliases) Load() error { a.loadDefaults() + + _, err := os.Stat(K9sAlias) + if os.IsNotExist(err) { + return nil + } + return a.LoadAliases(K9sAlias) } @@ -143,8 +150,7 @@ func (a *Aliases) Define(gvr string, aliases ...string) { func (a *Aliases) LoadAliases(path string) error { f, err := ioutil.ReadFile(path) if err != nil { - log.Warn().Err(err).Msgf("No custom aliases found") - return nil + return err } var aa Aliases From 8482f26341bf08ed0e07460addbba2a31965f45b Mon Sep 17 00:00:00 2001 From: Joscha Alisch Date: Fri, 7 Feb 2020 19:17:45 +0100 Subject: [PATCH 2/2] Get message back but as debug only --- internal/config/alias.go | 1 + 1 file changed, 1 insertion(+) diff --git a/internal/config/alias.go b/internal/config/alias.go index dd22e22c..b5da63fb 100644 --- a/internal/config/alias.go +++ b/internal/config/alias.go @@ -91,6 +91,7 @@ func (a *Aliases) Load() error { _, err := os.Stat(K9sAlias) if os.IsNotExist(err) { + log.Debug().Err(err).Msgf("No custom aliases found") return nil }