mirror of
https://github.com/levogevo/ffmpeg-builder.git
synced 2026-01-15 19:06:17 +00:00
add logName to echo_if_fail
This commit is contained in:
@@ -319,6 +319,7 @@ do_build() {
|
||||
test -f "${patch}" || continue
|
||||
echo_if_fail patch -p1 -i "${patch}" || return 1
|
||||
done
|
||||
export LOGNAME="${build}"
|
||||
echo_if_fail build_"${build}"
|
||||
retval=$?
|
||||
popd >/dev/null || return 1
|
||||
|
||||
@@ -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}
|
||||
}
|
||||
|
||||
|
||||
@@ -219,7 +219,7 @@ set_encode_opts() {
|
||||
case "${flag}" in
|
||||
I)
|
||||
echo_warn "attempting install"
|
||||
sudo ln -sf "$(pwd)/scripts/recc_encode.sh" \
|
||||
sudo ln -sf "${SCRIPT_DIR}/encode.sh" \
|
||||
/usr/local/bin/encode || return 1
|
||||
echo_pass "succesfull install"
|
||||
exit 0
|
||||
|
||||
Reference in New Issue
Block a user