X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=do.go;h=4ed91ddaa929c09112fb2c6021ab47b0c3307a45;hb=3e54a0b7b57f437247bb2d7b3ee15fdbdc6efff7;hp=e120680fa05599c80b8c0dcc3d8ffc844886a2e8;hpb=cc18c735b51ace648dedb7a425a0b2e41e724af6;p=goredo.git 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)