From 1914bd48c2fb8c260ab36ebd073d7ef5bf5643fc Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri, 20 Mar 2026 13:16:48 +1000
Subject: [PATCH] cmd: Use $TOOLBOX_DEFAULT_CONTAINER to populate --container

If set, use the TOOLBOX_DEFAULT_CONTAINER environment variable in lieu
of the --container argument. This allows for much easier scripting with
partially interactive use-cases.

For example, a user may have different toolboxes for different projects.
With this patch one can use e.g. direnv to export the variable, allowing
for workflows like this:
   $ cd path/to/myrepo
   # direnv sets TOOLBOX_DEFAULT_CONTAINER to myrepo
   $ toolbox run meson compile -C build
   # expands to --container=myrepo

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 src/cmd/create.go      | 2 +-
 src/cmd/enter.go       | 2 +-
 src/cmd/run.go         | 2 +-
 src/pkg/utils/utils.go | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/cmd/create.go b/src/cmd/create.go
index bdd86be37..85c1c171d 100644
--- a/src/cmd/create.go
+++ b/src/cmd/create.go
@@ -83,7 +83,7 @@ func init() {
 	flags.StringVarP(&createFlags.container,
 		"container",
 		"c",
-		"",
+		os.Getenv("TOOLBOX_DEFAULT_CONTAINER"),
 		"Assign a different name to the Toolbx container")
 
 	flags.StringVarP(&createFlags.distro,
diff --git a/src/cmd/enter.go b/src/cmd/enter.go
index 9ba84d6ad..25c1ee313 100644
--- a/src/cmd/enter.go
+++ b/src/cmd/enter.go
@@ -46,7 +46,7 @@ func init() {
 	flags.StringVarP(&enterFlags.container,
 		"container",
 		"c",
-		"",
+		os.Getenv("TOOLBOX_DEFAULT_CONTAINER"),
 		"Enter a Toolbx container with the given name")
 
 	flags.StringVarP(&enterFlags.distro,
diff --git a/src/cmd/run.go b/src/cmd/run.go
index 1de96c7a4..29caf950f 100644
--- a/src/cmd/run.go
+++ b/src/cmd/run.go
@@ -76,7 +76,7 @@ func init() {
 	flags.StringVarP(&runFlags.container,
 		"container",
 		"c",
-		"",
+		os.Getenv("TOOLBOX_DEFAULT_CONTAINER"),
 		"Run command inside a Toolbx container with the given name")
 
 	flags.StringVarP(&runFlags.distro,
diff --git a/src/pkg/utils/utils.go b/src/pkg/utils/utils.go
index f3de23b1b..7cdeb8183 100644
--- a/src/pkg/utils/utils.go
+++ b/src/pkg/utils/utils.go
@@ -103,6 +103,7 @@ var (
 		"SHELL",
 		"SSH_AUTH_SOCK",
 		"TERM",
+		"TOOLBOX_DEFAULT_CONTAINER",
 		"TOOLBOX_PATH",
 		"USER",
 		"VTE_VERSION",