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

minimal/do: fix t/000-set-minus-e on some shells.

Browse source 
Running commands in "||" context (like "x || return") disables "set -e"
behaviour in that context, even several levels deep in the call
hierarchy.  The exact behaviour varies between shells, but this caused
a test failure with at least zsh 5.3.1 on debian.
This commit is contained in:
Avery Pennarun 2018-12-17 12:09:49 +00:00
commit 54d8399718
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
minimal/do
View file

@ -273,6 +273,8 @@ _run_dofile()
exec /$cmd "$PWD/$dofile" "$@" exec /$cmd "$PWD/$dofile" "$@"
else else
set -$_do_opt_verbose$_do_opt_exec set -$_do_opt_verbose$_do_opt_exec
# If $dofile is empty, "." might not change $? at
# all, so we clear it first with ":".
:; . "$PWD/$dofile" :; . "$PWD/$dofile"
fi fi
} }
@ -336,7 +338,12 @@ _do()
# if that's zero length too, forget it # if that's zero length too, forget it
[ -s "$tmp" ] || rm -f "$tmp" [ -s "$tmp" ] || rm -f "$tmp"
fi fi
) 3>$qtmp 4<$qtmp || return ) 3>$qtmp 4<$qtmp # can't use "|| return" here...
# ...because "|| return" would mess up "set -e" inside the ()
# on some shells. Running commands in "||" context, even
# deep inside, will stop "set -e" from functioning.
rv=$?
[ "$rv" = 0 ] || return "$rv"
mv "$tmp" "$target" 2>/dev/null mv "$tmp" "$target" 2>/dev/null
[ -e "$target.did.tmp" ] && [ -e "$target.did.tmp" ] &&
mv "$target.did.tmp" "$target.did" || mv "$target.did.tmp" "$target.did" ||