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 e120680fa05599c80b8c0dcc3d8ffc844886a2e8..4ed91ddaa929c09112fb2c6021ab47b0c3307a45 100644 (file)
--- 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)