diff options
author | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2016-07-30 17:21:57 +0300 |
---|---|---|
committer | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2016-07-30 17:21:57 +0300 |
commit | 5f5fccbc36c1072150d1b665d9d9ef93a5401b82 (patch) | |
tree | 26be29ec1ca5f2fb2a4e1b731f055f7408d36ea2 /helpers | |
parent | 4ddd5361c1ee9b8abbd1f1cb60395d0979127f03 (diff) |
Do not return empty theme dirs
This prevents reading data etc. from the root.
Fixes #2320
Diffstat (limited to 'helpers')
-rw-r--r-- | helpers/path.go | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/helpers/path.go b/helpers/path.go index a31f33948..1d3419fb2 100644 --- a/helpers/path.go +++ b/helpers/path.go @@ -183,13 +183,15 @@ func GetThemeDataDirPath() (string, error) { } func getThemeDirPath(path string) (string, error) { - var themeDir string - if ThemeSet() { - themeDir = filepath.Join(GetThemeDir(), path) - if _, err := os.Stat(themeDir); os.IsNotExist(err) { - return "", fmt.Errorf("Unable to find %s directory for theme %s in %s", path, viper.GetString("theme"), themeDir) - } + if !ThemeSet() { + return "", errors.New("No theme set") } + + themeDir := filepath.Join(GetThemeDir(), path) + if _, err := os.Stat(themeDir); os.IsNotExist(err) { + return "", fmt.Errorf("Unable to find %s directory for theme %s in %s", path, viper.GetString("theme"), themeDir) + } + return themeDir, nil } |