From feb774112c4dc413f0eaade314f7f05e73fb5a30 Mon Sep 17 00:00:00 2001 From: Darren Shepherd Date: Mon, 23 Sep 2024 10:55:09 -0700 Subject: [PATCH 1/2] bug: load vcs support in embedded server always --- main.go | 2 -- pkg/gptscript/gptscript.go | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/main.go b/main.go index 33ab4278..02923925 100644 --- a/main.go +++ b/main.go @@ -2,8 +2,6 @@ package main import ( "github.com/gptscript-ai/gptscript/pkg/cli" - // Load all VCS - _ "github.com/gptscript-ai/gptscript/pkg/loader/vcs" ) func main() { diff --git a/pkg/gptscript/gptscript.go b/pkg/gptscript/gptscript.go index 11afb7d6..679eb503 100644 --- a/pkg/gptscript/gptscript.go +++ b/pkg/gptscript/gptscript.go @@ -25,6 +25,9 @@ import ( "github.com/gptscript-ai/gptscript/pkg/repos/runtimes" "github.com/gptscript-ai/gptscript/pkg/runner" "github.com/gptscript-ai/gptscript/pkg/types" + + // Load all VCS + _ "github.com/gptscript-ai/gptscript/pkg/loader/vcs" ) var log = mvl.Package() From 63da331569e2000a890f3fe959337a49c6bd874c Mon Sep 17 00:00:00 2001 From: Darren Shepherd Date: Mon, 23 Sep 2024 10:55:40 -0700 Subject: [PATCH 2/2] chore: try always running exec for "sh -c" in engine --- pkg/engine/cmd.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/engine/cmd.go b/pkg/engine/cmd.go index 33a67640..5b27a579 100644 --- a/pkg/engine/cmd.go +++ b/pkg/engine/cmd.go @@ -328,7 +328,7 @@ func (e *Engine) newCommand(ctx context.Context, extraEnv []string, tool types.T } if useShell { - args = append([]string{"/bin/sh", "-c"}, strings.Join(args, " ")) + args = append([]string{"/bin/sh", "-c"}, "exec "+strings.Join(args, " ")) } else { args[0] = env.Lookup(envvars, args[0]) }