levogevo/ffmpeg-builder
1
0
Fork 0
mirror of https://github.com/levogevo/ffmpeg-builder.git synced 2026-01-15 19:06:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

add logName to echo_if_fail

Browse Source
This commit is contained in:
Levon Gevorgyan
2025-08-28 18:51:19 -05:00
parent 315d340257
commit b1c89719d0
5 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/common.sh
View File

@@ -22,11 +22,12 @@ void() { echo "$@" >/dev/null; }
echo_if_fail() {
local cmd=("$@")
local out="${TMP_DIR}/.stdout-${RANDOM}"
local err="${TMP_DIR}/.stderr-${RANDOM}"
local logName="${LOGNAME:-${RANDOM}}"
local out="${TMP_DIR}/.stdout-${logName}"
local err="${TMP_DIR}/.stderr-${logName}"
# set trace to the cmdEvalTrace and open file descriptor
local cmdEvalTrace="${TMP_DIR}/.cmdEvalTrace-${RANDOM}"
local cmdEvalTrace="${TMP_DIR}/.cmdEvalTrace-${logName}"
test -d "${TMP_DIR}" || mkdir -p "${TMP_DIR}"
exec 5>"${cmdEvalTrace}"
export BASH_XTRACEFD=5
@@ -61,7 +62,9 @@ echo_if_fail() {
tail -n 10 "${err}"
echo
fi
rm "${out}" "${err}" "${cmdEvalTrace}"
if [[ -z ${LOGNAME} ]]; then
rm "${out}" "${err}" "${cmdEvalTrace}"
fi
return ${retval}
}