Merge pull request #329 from ibuildthecloud/main

bug: sys.getenv should be able to get GPTSCRIPT_WORKSPACE_DIR

Author: ibuildthecloud

pkg/builtin/builtin.go

@@ -319,7 +319,10 @@ func SysExec(ctx context.Context, env []string, input string) (string, error) {
 	if err != nil {
 		_, _ = os.Stdout.Write(out)
 	}
-	return string(out), err
+	if err != nil {
+		return string(out), fmt.Errorf("OUTPUT: %s, ERROR: %w", out, err)
+	}
+	return string(out), nil
 }
 
 func getWorkspaceDir(envs []string) (string, error) {
@@ -617,6 +620,13 @@ func SysGetenv(ctx context.Context, env []string, input string) (string, error)
 		return "", err
 	}
 	log.Debugf("looking up env var %s", params.Name)
+	for _, env := range env {
+		k, v, ok := strings.Cut(env, "=")
+		if ok && k == params.Name {
+			log.Debugf("found env var %s in local environment", params.Name)
+			return v, nil
+		}
+	}
 	return os.Getenv(params.Name), nil
 }
 

pkg/builtin/builtin_test.go

@@ -0,0 +1,23 @@
+package builtin
+
+import (
+	"context"
+	"testing"
+
+	"github.com/hexops/autogold/v2"
+	"github.com/stretchr/testify/require"
+)
+
+func TestSysGetenv(t *testing.T) {
+	v, err := SysGetenv(context.Background(), []string{
+		"MAGIC=VALUE",
+	}, `{"name":"MAGIC"}`)
+	require.NoError(t, err)
+	autogold.Expect("VALUE").Equal(t, v)
+
+	v, err = SysGetenv(context.Background(), []string{
+		"MAGIC=VALUE",
+	}, `{"name":"MAGIC2"}`)
+	require.NoError(t, err)
+	autogold.Expect("").Equal(t, v)
+}