fix environ order and overload

Author: speier

Lunafile

@@ -10,7 +10,7 @@ http.get(u)
 # common
 
 # define default for an env var, provided env var will override
-env("OP_ENABLED", False)
+env("OP_ENABLED", True)
 
 # ldflags('-X github.com/moonwalker/platform/internal/build.version=$VERSION')
 # docker_repo('europe-docker.pkg.dev/mw-lunar/platform')
@@ -30,7 +30,7 @@ task("docs2", cmds=['echo "gello"', 'echo "bboo"'])
 
 
 def docs():
-    sh("echo $VERSION @ $FOO, $OP_TEST", env=["FOO=BAR"])
+    sh("echo $VERSION @ $FOO, $OP_ENABLED", env=["FOO=BAR3"])
 
 
 def stacks(stack, command, *args):

internal/support/env.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"os"
+	"slices"
 	"strconv"
 	"strings"
 	"sync"
@@ -13,40 +14,41 @@ import (
 )
 
 var (
+	defenv   = ".env"
+	usrenv   = ".env.local"
 	once     sync.Once
 	opclient *onepassword.Client
 )
 
+// load global .env files
 func init() {
-	loadEnvFiles("")
+	// .env (default)
+	godotenv.Load(defenv)
+
+	// .env.local # local user specific (usually git ignored)
+	godotenv.Overload(usrenv)
 }
 
 func Environ(dir string, env ...string) []string {
-	loadEnvFiles(dir)
-
-	environ := append(os.Environ(), env...)
-	for i, e := range environ {
-		pair := strings.SplitN(e, "=", 2)
-		environ[i] = pair[0] + "=" + op(pair[1])
-	}
+	osenv := os.Environ()
+	dotenv := dotenvFiles(dir)
 
-	return environ
+	return slices.Concat(osenv, dotenv, env)
 }
 
-func loadEnvFiles(dir string) {
-	defenv := ".env"
-	usrenv := ".env.local"
+func dotenvFiles(dir string) (res []string) {
+	filenames := []string{dir + "/" + defenv, dir + "/" + usrenv}
 
-	if dir != "" {
-		defenv = dir + "/" + defenv
-		usrenv = dir + "/" + usrenv
+	envMap, err := godotenv.Read(filenames...)
+	if err != nil {
+		return
 	}
 
-	// .env (default)
-	godotenv.Load(defenv)
+	for k, v := range envMap {
+		res = append(res, k+"="+v)
+	}
 
-	// .env.local # local user specific (usually git ignored)
-	godotenv.Overload(usrenv)
+	return
 }
 
 func op(ref string) string {