Unify dep*Read/Write name

[goredo.git] / do.go

diff --git a/do.go b/do.go
index 360cc29b0e99fa51e306588b3e8024133a87f10d..c4a569665b51f029aa9161d2cf03238fa6ce20e0 100644 (file)
--- a/do.go
+++ b/do.go
@@ -1,6 +1,6 @@
 /*
-goredo -- redo implementation on pure Go
-Copyright (C) 2020 Sergey Matveev <stargrave@stargrave.org>
+goredo -- djb's redo implementation on pure Go
+Copyright (C) 2020-2021 Sergey Matveev <stargrave@stargrave.org>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -60,7 +60,7 @@ func findDo(fdDep *os.File, cwd, tgt string) (string, int, error) {
                        doFile = strings.Join(append(
                                []string{"default"}, append(exts, "do")...,
                        ), ".")
-                       if len(levels) > 0 || doFile != doFileOrig {
+                       if len(levels) > 0 || (doFile != doFileOrig && doFile != tgt) {
                                exists, err = existsDo(fdDep, cwd, path.Join(updir, doFile))
                                if err != nil {
                                        return "", 0, err
@@ -72,7 +72,7 @@ func findDo(fdDep *os.File, cwd, tgt string) (string, int, error) {
                        exts = exts[1:]
                }
                doFile = "default.do"
-               if len(levels) > 0 || doFile != doFileOrig {
+               if len(levels) > 0 || (doFile != doFileOrig && doFile != tgt) {
                        exists, err = existsDo(fdDep, cwd, path.Join(updir, doFile))
                        if err != nil {
                                return "", 0, err
@@ -82,7 +82,7 @@ func findDo(fdDep *os.File, cwd, tgt string) (string, int, error) {
                        }
                }
                levels = append(levels, "..")
-               dirAbs, err := filepath.Abs(updir)
+               dirAbs, err := filepath.Abs(path.Join(cwd, updir))
                if err != nil {
                        panic(err)
                }