From: Sergey Matveev <stargrave@stargrave.org>
Date: Mon, 14 Dec 2020 16:37:20 +0000 (+0300)
Subject: findDo must return non-relative do-file path
X-Git-Tag: v0.5.0~6
X-Git-Url: http://www.git.cypherpunks.ru/?p=goredo.git;a=commitdiff_plain;h=3e54a0b7b57f437247bb2d7b3ee15fdbdc6efff7

findDo must return non-relative do-file path

Because it already provides number of up-levels.
---

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)