From 97f1efbb726c0ffea1cb4a336651804614c2ed72 Mon Sep 17 00:00:00 2001 From: Noah Hsu Date: Mon, 5 Dec 2022 18:32:48 +0800 Subject: [PATCH] feat!: disable `--force-bin-dir` if `--data` is abs related issues: #2580 #2542 after this commit, the `--force-bin-dir` would take no effect if `--data` is absolute path --- internal/bootstrap/config.go | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/internal/bootstrap/config.go b/internal/bootstrap/config.go index 134066a2..661d160b 100644 --- a/internal/bootstrap/config.go +++ b/internal/bootstrap/config.go @@ -13,12 +13,14 @@ import ( func InitConfig() { if flags.ForceBinDir { - ex, err := os.Executable() - if err != nil { - utils.Log.Fatal(err) + if !filepath.IsAbs(flags.DataDir) { + ex, err := os.Executable() + if err != nil { + utils.Log.Fatal(err) + } + exPath := filepath.Dir(ex) + flags.DataDir = filepath.Join(exPath, flags.DataDir) } - exPath := filepath.Dir(ex) - flags.DataDir = filepath.Join(exPath, "data") } configPath := filepath.Join(flags.DataDir, "config.json") log.Infof("reading config file: %s", configPath)