From 60619040caa24070103318b0001e027a4b68e46c Mon Sep 17 00:00:00 2001 From: Will Roden Date: Sat, 9 Dec 2023 15:37:31 -0600 Subject: [PATCH] update relPath --- internal/bindown/install.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/internal/bindown/install.go b/internal/bindown/install.go index bf47651e..1d0c9413 100644 --- a/internal/bindown/install.go +++ b/internal/bindown/install.go @@ -205,6 +205,11 @@ func createBindownWrapper(target, cacheDir, tag, baseURL string) (string, error) // relPath returns target relative to base and converted to slash-separated path. // Unlike filepath.Rel, it converts both paths to absolute paths before calculating the relative path. func relPath(base, target string) (string, error) { + // if it works without abs, use that + rel, err := filepath.Rel(base, target) + if err == nil { + return filepath.ToSlash(rel), nil + } absBase, err := filepath.Abs(base) if err != nil { return "", err @@ -221,7 +226,7 @@ func relPath(base, target string) (string, error) { if err != nil { return "", err } - rel, err := filepath.Rel(absBase, absTarget) + rel, err = filepath.Rel(absBase, absTarget) if err != nil { return "", err }