Code Review
/
doctor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix functions for fuel installer
[doctor.git]
/
tests
/
functions-common
diff --git
a/tests/functions-common
b/tests/functions-common
index
08d489e
..
7928f20
100644
(file)
--- a/
tests/functions-common
+++ b/
tests/functions-common
@@
-4,7
+4,7
@@
# is_set env-var
function is_set {
local var=\$"$1"
# is_set env-var
function is_set {
local var=\$"$1"
- eval "[
-n \"$var\"
]"
+ eval "[
[ -n \"$var\" ]
]"
}
# Prints backtrace info
}
# Prints backtrace info
@@
-41,6
+41,8
@@
function err {
# die $LINENO "message"
function die {
local exitcode=$?
# die $LINENO "message"
function die {
local exitcode=$?
+ local xtrace
+ xtrace=$(set +o | grep xtrace)
set +o xtrace
local line=$1; shift
if [ $exitcode == 0 ]; then
set +o xtrace
local line=$1; shift
if [ $exitcode == 0 ]; then
@@
-50,6
+52,7
@@
function die {
err $line "$*"
# Give buffers a second to flush
sleep 1
err $line "$*"
# Give buffers a second to flush
sleep 1
+ $xtrace
exit $exitcode
}
exit $exitcode
}