From 748cb0945a4cc18746ed1bd8459e54d8d4d73fc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mika=C3=ABl=20Cluseau?= Date: Wed, 20 Jun 2018 13:59:15 +1100 Subject: [PATCH] fix: config file paths consistency --- data.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/data.go b/data.go index 98f2edf..a1b6c05 100644 --- a/data.go +++ b/data.go @@ -14,19 +14,21 @@ var ( ) func readConfig() (config *clustersconfig.Config, err error) { + configFile := filepath.Join(*dataDir, "current-config.yaml") + if *configFromDir != "" { - config, err = clustersconfig.FromDir(*dataDir) + config, err = clustersconfig.FromDir(*configFromDir) if err != nil { log.Print("failed to load config: ", err) return nil, err } - if err = config.SaveTo(filepath.Join(*dataDir, "global-config.yaml")); err != nil { + if err = config.SaveTo(configFile); err != nil { return nil, err } return } - return clustersconfig.FromFile(filepath.Join(*dataDir, "current-config.yaml")) + return clustersconfig.FromFile(configFile) }