From b1c89719d0cfd9adfb90d60423f70c5c8981a2ad Mon Sep 17 00:00:00 2001
From: Levon Gevorgyan <lgevorgyan03@gmail.com>
Date: Thu, 28 Aug 2025 18:51:19 -0500
Subject: [PATCH] add logName to echo_if_fail

---
 lib/build.sh     |  1 +
 lib/common.sh    | 11 +++++++----
 lib/encode.sh    |  2 +-
 main.sh          |  2 +-
 scripts/entry.sh |  2 +-
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/lib/build.sh b/lib/build.sh
index ae6157a..a2113cb 100644
--- a/lib/build.sh
+++ b/lib/build.sh
@@ -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
diff --git a/lib/common.sh b/lib/common.sh
index 0d51f40..b74dff3 100644
--- a/lib/common.sh
+++ b/lib/common.sh
@@ -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}
 }
 
diff --git a/lib/encode.sh b/lib/encode.sh
index c5b772e..23758d8 100644
--- a/lib/encode.sh
+++ b/lib/encode.sh
@@ -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
diff --git a/main.sh b/main.sh
index d2ca16e..b30d4aa 100755
--- a/main.sh
+++ b/main.sh
@@ -43,7 +43,7 @@ export FB_RUNNING_AS_SCRIPT=1
 scr_name="$(bash_basename $0)"
 cmd="${scr_name//.sh/}"
 if [[ $DEBUG == 1 ]]; then set -x; fi
-$cmd $@' >"${ENTRY_SCRIPT}"
+$cmd "$@"' >"${ENTRY_SCRIPT}"
 		chmod +x "${ENTRY_SCRIPT}"
 	fi
 
diff --git a/scripts/entry.sh b/scripts/entry.sh
index 19d4ced..283cc93 100755
--- a/scripts/entry.sh
+++ b/scripts/entry.sh
@@ -5,4 +5,4 @@ export FB_RUNNING_AS_SCRIPT=1
 scr_name="$(bash_basename $0)"
 cmd="${scr_name//.sh/}"
 if [[ $DEBUG == 1 ]]; then set -x; fi
-$cmd $@
+$cmd "$@"