fix: allow GPTSCRIPT_BIN to be absolute, relatative, or relative-to-me

Signed-off-by: Donnie Adams <[email protected]>

Author: thedadams

exec.go

@@ -12,6 +12,8 @@ import (
 	"strings"
 )
 
+const relativeToBinaryPath = "<me>"
+
 // Opts represents options for the gptscript tool or file.
 type Opts struct {
 	DisableCache bool   `json:"disableCache"`
@@ -313,11 +315,11 @@ func concatTools(tools []fmt.Stringer) string {
 
 func getCommand() string {
 	if gptScriptBin := os.Getenv("GPTSCRIPT_BIN"); gptScriptBin != "" {
-		if filepath.IsAbs(gptScriptBin) || len(os.Args) == 0 {
+		if !strings.HasPrefix(gptScriptBin, relativeToBinaryPath) || len(os.Args) == 0 {
 			return gptScriptBin
 		}
 
-		return filepath.Join(filepath.Dir(os.Args[0]), gptScriptBin)
+		return filepath.Join(filepath.Dir(os.Args[0]), strings.TrimPrefix(gptScriptBin, relativeToBinaryPath))
 	}
 
 	return "gptscript"

exec_test.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"io"
 	"os"
+	"path/filepath"
 	"runtime"
 	"strings"
 	"testing"
@@ -516,3 +517,44 @@ func TestExecWithWorkspace(t *testing.T) {
 		t.Errorf("Unexpected output: %s", out)
 	}
 }
+
+func TestGetCommand(t *testing.T) {
+	currentEnvVar := os.Getenv("GPTSCRIPT_BIN")
+	t.Cleanup(func() {
+		_ = os.Setenv("GPTSCRIPT_BIN", currentEnvVar)
+	})
+
+	tests := []struct {
+		name   string
+		envVar string
+		want   string
+	}{
+		{
+			name: "no env var set",
+			want: "gptscript",
+		},
+		{
+			name:   "env var set to absolute path",
+			envVar: "/usr/local/bin/gptscript",
+			want:   "/usr/local/bin/gptscript",
+		},
+		{
+			name:   "env var set to relative path",
+			envVar: "../bin/gptscript",
+			want:   "../bin/gptscript",
+		},
+		{
+			name:   "env var set to relative 'to me' path",
+			envVar: "<me>/../bin/gptscript",
+			want:   filepath.Join(filepath.Dir(os.Args[0]), "../bin/gptscript"),
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			_ = os.Setenv("GPTSCRIPT_BIN", tt.envVar)
+			if got := getCommand(); got != tt.want {
+				t.Errorf("getCommand() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}