/*
-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-2022 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
var TopDir string
func existsDo(fdDep *os.File, cwd, pth string) (bool, error) {
- if _, err := os.Stat(path.Join(cwd, pth)); err == nil {
+ if FileExists(path.Join(cwd, pth)) {
return true, nil
}
return false, ifcreate(fdDep, pth)
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
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
}
}
levels = append(levels, "..")
- dirAbs, err := filepath.Abs(updir)
+ dirAbs, err := filepath.Abs(path.Join(cwd, updir))
if err != nil {
panic(err)
}
if dirAbs == TopDir {
break
}
- if _, err = os.Stat(path.Join(dirAbs, RedoDir, TopFile)); err == nil {
+ if FileExists(path.Join(dirAbs, RedoDir, TopFile)) {
break
}
if dirAbs == dirAbsPrev {