Introduce client runtime boundaries

6 files changed, 12 insertions, 7 deletions

diff --git a/cmd/dcat/main.go b/cmd/dcat/main.go
index df580c4..64c6f10 100644
--- a/cmd/dcat/main.go
+++ b/cmd/dcat/main.go
@@ -54,7 +54,8 @@ func main() {
 	config.Setup(source.Client, &args, flag.Args())
 
 	if displayVersion {
-		version.PrintAndExit()
+		runtimeCfg := config.CurrentRuntime()
+		version.PrintAndExit(runtimeCfg.Client != nil && runtimeCfg.Client.TermColorsEnable)
 	}
 
 	runtime := cli.NewClientRuntime(context.Background(), profileFlags, "dcat")
diff --git a/cmd/dgrep/main.go b/cmd/dgrep/main.go
index a36a6ae..aadf5c7 100644
--- a/cmd/dgrep/main.go
+++ b/cmd/dgrep/main.go
@@ -60,7 +60,8 @@ func main() {
 	config.Setup(source.Client, &args, flag.Args())
 
 	if displayVersion {
-		version.PrintAndExit()
+		runtimeCfg := config.CurrentRuntime()
+		version.PrintAndExit(runtimeCfg.Client != nil && runtimeCfg.Client.TermColorsEnable)
 	}
 
 	runtime := cli.NewClientRuntime(context.Background(), profileFlags, "dgrep")
diff --git a/cmd/dmap/main.go b/cmd/dmap/main.go
index 33ace65..e6665ee 100644
--- a/cmd/dmap/main.go
+++ b/cmd/dmap/main.go
@@ -60,7 +60,8 @@ func main() {
 	config.Setup(source.Client, &args, flag.Args())
 
 	if displayVersion {
-		version.PrintAndExit()
+		runtimeCfg := config.CurrentRuntime()
+		version.PrintAndExit(runtimeCfg.Client != nil && runtimeCfg.Client.TermColorsEnable)
 	}
 
 	runtime := cli.NewClientRuntime(context.Background(), profileFlags, "dmap")
diff --git a/cmd/dserver/main.go b/cmd/dserver/main.go
index 7c13b29..b7ad091 100644
--- a/cmd/dserver/main.go
+++ b/cmd/dserver/main.go
@@ -46,9 +46,10 @@ func main() {
 	config.Setup(source.Server, &args, flag.Args())
 
 	if displayVersion {
-		version.PrintAndExit()
+		runtimeCfg := config.CurrentRuntime()
+		version.PrintAndExit(runtimeCfg.Client != nil && runtimeCfg.Client.TermColorsEnable)
 	}
-	version.Print()
+	version.Print(false)
 
 	ctx, cancel := context.WithCancel(context.Background())
 	if shutdownAfter > 0 {
diff --git a/cmd/dtail/main.go b/cmd/dtail/main.go
index 4ea27df..d3fe931 100644
--- a/cmd/dtail/main.go
+++ b/cmd/dtail/main.go
@@ -76,7 +76,8 @@ func main() {
 	}
 	config.Setup(source.Client, &args, flag.Args())
 	if displayVersion {
-		version.PrintAndExit()
+		runtimeCfg := config.CurrentRuntime()
+		version.PrintAndExit(runtimeCfg.Client != nil && runtimeCfg.Client.TermColorsEnable)
 	}
 	if !args.Plain {
 		if displayWideColorTable {
diff --git a/cmd/dtailhealth/main.go b/cmd/dtailhealth/main.go
index f1fbf6f..821684f 100644
--- a/cmd/dtailhealth/main.go
+++ b/cmd/dtailhealth/main.go
@@ -33,7 +33,7 @@ func main() {
 	flag.Parse()
 
 	if displayVersion {
-		version.PrintAndExit()
+		version.PrintAndExit(false)
 	}
 
 	config.Setup(source.HealthCheck, &args, flag.Args())