From 4b8c929cdc3dad68084a405f03b3c64dee64ed5e Mon Sep 17 00:00:00 2001 From: Avery Pennarun Date: Tue, 16 Nov 2010 03:20:52 -0800 Subject: [PATCH] minimal/do: add support for default.* targets. Unit tests now pass again with 'minimal/do test'. --- minimal/do | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/minimal/do b/minimal/do index b9df8ce..5fc84c8 100755 --- a/minimal/do +++ b/minimal/do @@ -20,10 +20,17 @@ fi _do() { TARGET="$1" - DOFILE="$TARGET.do" if [ ! -e "$TARGET" ]; then printf '\033[32mdo \033[1m%s\033[m\n' "$PWD/$TARGET" >&2 echo "$PWD/$TARGET" >>"$DO_BUILT" + dof=".$TARGET" + DOFILE="$TARGET.do" + while [ ! -e "$DOFILE" ]; do + dof2=$(echo "$dof" | sed 's/\.[^\.]*//') + [ "$dof" = "$dof2" ] && break + dof="$dof2" + DOFILE="default$dof.do" + done set "$TARGET" "" "$TARGET.tmp" ( . "$PWD/$DOFILE" >"$TARGET.tmp" ) && mv "$TARGET.tmp" "$TARGET"