From c7f06448c56437de733aa72512386d0d9b09aa6d Mon Sep 17 00:00:00 2001 From: Avery Pennarun Date: Sat, 15 Jan 2011 21:44:08 -0800 Subject: [PATCH] minimal/do: support searching parent dirs for .do files. Now all tests pass again with both redo and minimal/do. --- minimal/do | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/minimal/do b/minimal/do index 1d3c94a..f3e1ab9 100755 --- a/minimal/do +++ b/minimal/do @@ -51,7 +51,7 @@ if [ -z "$DO_BUILT" ]; then fi -_find_dofile() +_find_dofile_pwd() { DOFILE=default.$1.do while :; do @@ -64,6 +64,21 @@ _find_dofile() } +_find_dofile() +{ + PREFIX= + while :; do + _find_dofile_pwd "$1" + [ -e "$DOFILE" ] && break + [ "$PWD" = "/" ] && break + TARGET=${PWD##*/}/$TARGET + PREFIX=${PWD##*/}/$PREFIX + cd .. + done + BASE=$PREFIX$BASE +} + + _run_dofile() { export DO_DEPTH="$DO_DEPTH "