From 43e9246c6b77cfe0905f47f10364bb3605ff8061 Mon Sep 17 00:00:00 2001
From: Jan De Dobbeleer <jan.de.dobbeleer@gmail.com>
Date: Wed, 14 Feb 2024 21:34:59 +0100
Subject: [PATCH] fix(cli): initialize .Var correctly

---
 src/cli/config_export_image.go | 5 ++++-
 src/cli/debug.go               | 9 +++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/cli/config_export_image.go b/src/cli/config_export_image.go
index cb8edfd9..54925df7 100644
--- a/src/cli/config_export_image.go
+++ b/src/cli/config_export_image.go
@@ -57,10 +57,13 @@ Exports the config to an image file using customized output options.`,
 		defer env.Close()
 		cfg := engine.LoadConfig(env)
 
-		// set dsane defaults for things we don't print
+		// set sane defaults for things we don't print
 		cfg.ConsoleTitleTemplate = ""
 		cfg.PWD = ""
 
+		// add variables to the environment
+		env.Var = cfg.Var
+
 		writerColors := cfg.MakeColors()
 		writer := &ansi.Writer{
 			TerminalBackground: shell.ConsoleBackgroundColor(env, cfg.TerminalBackground),
diff --git a/src/cli/debug.go b/src/cli/debug.go
index 87cd562c..30447b2f 100644
--- a/src/cli/debug.go
+++ b/src/cli/debug.go
@@ -21,6 +21,7 @@ var debugCmd = &cobra.Command{
 	Args:  cobra.NoArgs,
 	Run: func(_ *cobra.Command, _ []string) {
 		startTime := time.Now()
+
 		env := &platform.Shell{
 			CmdFlags: &platform.Flags{
 				Config: config,
@@ -30,9 +31,15 @@ var debugCmd = &cobra.Command{
 				Plain:  plain,
 			},
 		}
+
 		env.Init()
 		defer env.Close()
+
 		cfg := engine.LoadConfig(env)
+
+		// add variables to the environment
+		env.Var = cfg.Var
+
 		writerColors := cfg.MakeColors()
 		writer := &ansi.Writer{
 			TerminalBackground: shell.ConsoleBackgroundColor(env, cfg.TerminalBackground),
@@ -40,6 +47,7 @@ var debugCmd = &cobra.Command{
 			Plain:              plain,
 			TrueColor:          env.CmdFlags.TrueColor,
 		}
+
 		writer.Init(shell.GENERIC)
 		eng := &engine.Engine{
 			Config: cfg,
@@ -47,6 +55,7 @@ var debugCmd = &cobra.Command{
 			Writer: writer,
 			Plain:  plain,
 		}
+
 		fmt.Print(eng.PrintDebug(startTime, build.Version))
 	},
 }