forks/apenwarr-redo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

minimal/do whichdo: should print ../default.do if ../$1.do exists.

Browse source 
It would be incorrect to print ../$1.do (we only use $1.do in the
*current* directly, not prefix dirs; we only use default*.do in
those).  However, when we found ../default.do, we forgot to print it,
because of a silly logic error.
This commit is contained in:
Avery Pennarun 2018-11-02 03:11:38 -04:00
commit a14aa4c86d
5 changed files with 21 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
minimal/do
View file

@ -208,10 +208,11 @@ _find_dofiles()
_dirsplit "$dofile"
dodir=$_dirsplit_dir
dofile=$_dirsplit_base
[ -n "$dodir" ] && dodir=${dodir%/}/
[ -e "$dodir$dofile" ] && return 0
for i in $(seq 100); do
[ -n "$dodir" ] && dodir=${dodir%/}/
#echo "_find_dofiles: '$dodir' '$dofile'" >&2
[ -e "$dodir$dofile" ] && return 0
_find_dofiles_pwd "$dodir" "$dofile" && return 0
newdir=$(_normpath "${dodir}..")
[ "$newdir" = "$dodir" ] && break