From 3e54a0b7b57f437247bb2d7b3ee15fdbdc6efff7 Mon Sep 17 00:00:00 2001 From: Sergey Matveev Date: Mon, 14 Dec 2020 19:37:20 +0300 Subject: [PATCH] findDo must return non-relative do-file path Because it already provides number of up-levels. --- do.go | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/do.go b/do.go index e120680..4ed91dd 100644 --- a/do.go +++ b/do.go @@ -59,8 +59,7 @@ func findDo(fdDep *os.File, cwd, tgt string) (string, int, error) { doFile = strings.Join(append( []string{"default"}, append(exts, "do")..., ), ".") - pth := path.Join(updir, doFile) - exists, err = existsDo(fdDep, cwd, pth) + exists, err = existsDo(fdDep, cwd, path.Join(updir, doFile)) if err != nil { return "", 0, err } @@ -70,13 +69,12 @@ func findDo(fdDep *os.File, cwd, tgt string) (string, int, error) { exts = exts[1:] } doFile = "default.do" - pth := path.Join(updir, doFile) - exists, err = existsDo(fdDep, cwd, pth) + exists, err = existsDo(fdDep, cwd, path.Join(updir, doFile)) if err != nil { return "", 0, err } if exists { - return pth, len(levels), nil + return doFile, len(levels), nil } levels = append(levels, "..") dirAbs, err := filepath.Abs(updir) -- 2.44.0