Skip to content

Fix panic with repos aren't used #123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 7, 2024
Merged

Fix panic with repos aren't used #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions pkg/engine/cmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import (
"io"
"os"
"os/exec"
"path/filepath"
"sort"
"strings"
"sync/atomic"
Expand Down Expand Up @@ -81,7 +80,6 @@ func (e *Engine) getRuntimeEnv(ctx context.Context, tool types.Tool, cmd, env []
if err != nil {
return nil, err
}
workdir = filepath.Join(workdir, tool.Source.Repo.Path)
}
return append(env, "GPTSCRIPT_TOOL_DIR="+workdir), nil
}
Expand Down
5 changes: 3 additions & 2 deletions pkg/repos/get.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,13 @@ func New(cacheDir string, runtimes ...Runtime) *Manager {

func (m *Manager) setup(ctx context.Context, runtime Runtime, tool types.Tool, env []string) (string, []string, error) {
target := filepath.Join(m.storageDir, tool.Source.Repo.Revision, runtime.ID())
targetFinal := filepath.Join(target, tool.Source.Repo.Path)
doneFile := target + ".done"
envData, err := os.ReadFile(doneFile)
if err == nil {
var savedEnv []string
if err := json.Unmarshal(envData, &savedEnv); err == nil {
return target, append(env, savedEnv...), nil
return targetFinal, append(env, savedEnv...), nil
}
} else if !errors.Is(err, fs.ErrNotExist) {
return "", nil, err
Expand Down Expand Up @@ -88,7 +89,7 @@ func (m *Manager) setup(ctx context.Context, runtime Runtime, tool types.Tool, e
return "", nil, err
}

return target, append(env, newEnv...), os.Rename(doneFile+".tmp", doneFile)
return targetFinal, append(env, newEnv...), os.Rename(doneFile+".tmp", doneFile)
}

func (m *Manager) GetContext(ctx context.Context, tool types.Tool, cmd, env []string) (string, []string, error) {
Expand Down