From 6edd42629e705c8a634cf9302832b03dfbcb8f15 Mon Sep 17 00:00:00 2001 From: Cuong Manh Le Date: Fri, 6 Jan 2023 01:41:00 +0700 Subject: [PATCH] cmd/ctrld: correct write default config condition when start !76 was merged without rebasing on latest master, so it missed the condition of "--cd" when checking for writing default config. --- cmd/ctrld/cli.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cmd/ctrld/cli.go b/cmd/ctrld/cli.go index b3ed3a9..293d30e 100644 --- a/cmd/ctrld/cli.go +++ b/cmd/ctrld/cli.go @@ -162,7 +162,9 @@ func initCLI() { // WorkingDirectory is not supported on Windows. cfg.WorkingDirectory = dir // No config path, generating config in HOME directory. - if configPath == "" && !isNoConfigStart(cmd) && configBase64 == "" { + noConfigStart := isNoConfigStart(cmd) && cdUID != "" + writeDefaultConfig := !noConfigStart && configBase64 == "" && cdUID == "" + if configPath == "" && writeDefaultConfig { defaultConfigFile = filepath.Join(dir, defaultConfigFile) readConfigFile(true) }