redo-sh tests under github.com/chriscool/sharness

[goredo.git] / do.go

diff --git a/do.go b/do.go
index a2f95bf67ac4332149fc64657f51bec36d7b0084..360cc29b0e99fa51e306588b3e8024133a87f10d 100644 (file)
--- a/do.go
+++ b/do.go
@@ -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,24 +60,26 @@ 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 {
+                               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 {
+                       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)