From 699ec16ddc7a37fd164f3ef7622f4f4eeff9cca7 Mon Sep 17 00:00:00 2001 From: Grant Linville Date: Tue, 2 Jul 2024 16:45:18 -0400 Subject: [PATCH] fix: create cred helper dir properly on Windows Signed-off-by: Grant Linville --- pkg/credentials/util.go | 3 ++- pkg/repos/get.go | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/credentials/util.go b/pkg/credentials/util.go index f6165308..367b4d1d 100644 --- a/pkg/credentials/util.go +++ b/pkg/credentials/util.go @@ -5,7 +5,7 @@ import ( ) type CredentialHelperDirs struct { - RevisionFile, LastCheckedFile, BinDir, RepoDir string + RevisionFile, LastCheckedFile, BinDir, RepoDir, HelperDir string } func GetCredentialHelperDirs(cacheDir string) CredentialHelperDirs { @@ -14,5 +14,6 @@ func GetCredentialHelperDirs(cacheDir string) CredentialHelperDirs { LastCheckedFile: filepath.Join(cacheDir, "repos", "gptscript-credential-helpers", "last-checked"), BinDir: filepath.Join(cacheDir, "repos", "gptscript-credential-helpers", "bin"), RepoDir: filepath.Join(cacheDir, "repos", "gptscript-credential-helpers", "repo"), + HelperDir: filepath.Join(cacheDir, "repos", "gptscript-credential-helpers"), } } diff --git a/pkg/repos/get.go b/pkg/repos/get.go index be8d8594..2f96d8b3 100644 --- a/pkg/repos/get.go +++ b/pkg/repos/get.go @@ -7,7 +7,6 @@ import ( "fmt" "io/fs" "os" - "path" "path/filepath" "strings" "sync" @@ -133,7 +132,7 @@ func (m *Manager) deferredSetUpCredentialHelpers(ctx context.Context, cliCfg *co return err } - if err := os.MkdirAll(path.Dir(m.credHelperDirs.LastCheckedFile), 0755); err != nil { + if err := os.MkdirAll(m.credHelperDirs.HelperDir, 0755); err != nil { return err }