Don't segfault on empty aliases and silence warning

mine
Joscha Alisch 2020-02-07 19:14:12 +01:00
parent b544852ec7
commit 1ff60bbc74
No known key found for this signature in database
GPG Key ID: FCADD70C266FEEB5
1 changed files with 8 additions and 2 deletions

View File

@ -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