X-Git-Url: http://www.git.cypherpunks.ru/?p=goredo.git;a=blobdiff_plain;f=do.go;h=c4a569665b51f029aa9161d2cf03238fa6ce20e0;hp=a2f95bf67ac4332149fc64657f51bec36d7b0084;hb=b42c8c2dba5ea7667c32681338930969ed5c1cdb;hpb=f15fe27971bcf37a06bb9542ea1907f11444515a

diff --git a/do.go b/do.go
index a2f95bf..c4a5696 100644
--- 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
@@ -26,7 +26,10 @@ import (
 	"strings"
 )
 
-const TopFile = "top"
+const (
+	EnvTopDir = "REDO_TOP_DIR"
+	TopFile   = "top"
+)
 
 var TopDir string
 
@@ -46,6 +49,7 @@ func findDo(fdDep *os.File, cwd, tgt string) (string, int, error) {
 	if exists {
 		return doFile, 0, nil
 	}
+	doFileOrig := doFile
 	levels := []string{}
 	extsOrig := strings.Split(tgt, ".")[1:]
 	dirAbsPrev := ""
@@ -56,27 +60,29 @@ 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)
+			if len(levels) > 0 || (doFile != doFileOrig && doFile != tgt) {
+				exists, err = existsDo(fdDep, cwd, path.Join(updir, doFile))
+				if err != nil {
+					return "", 0, err
+				}
+				if exists {
+					return doFile, len(levels), nil
+				}
+			}
+			exts = exts[1:]
+		}
+		doFile = "default.do"
+		if len(levels) > 0 || (doFile != doFileOrig && doFile != tgt) {
+			exists, err = existsDo(fdDep, cwd, path.Join(updir, doFile))
 			if err != nil {
 				return "", 0, err
 			}
 			if exists {
 				return doFile, len(levels), nil
 			}
-			exts = exts[1:]
-		}
-		doFile = "default.do"
-		pth := path.Join(updir, doFile)
-		exists, err = existsDo(fdDep, cwd, pth)
-		if err != nil {
-			return "", 0, err
-		}
-		if exists {
-			return pth, len(levels), nil
 		}
 		levels = append(levels, "..")
-		dirAbs, err := filepath.Abs(updir)
+		dirAbs, err := filepath.Abs(path.Join(cwd, updir))
 		if err != nil {
 			panic(err)
 		}