diff --git a/lib/lib_trap_on_err.sh b/lib/lib_trap_on_err.sh index ccdd9f6..d109cba 100644 --- a/lib/lib_trap_on_err.sh +++ b/lib/lib_trap_on_err.sh @@ -36,22 +36,22 @@ guard_sourcing print_file_err() { { printf "❌ CISS.debian.live.builder Script failed. \n" - printf "❌ Git Commit : %s \n" "${VAR_GIT_REL}" - printf "❌ Version : %s \n" "${VAR_VERSION}" - printf "❌ Hostsystem : %s \n" "${VAR_SYSTEM}" - printf "❌ Error : %s \n" "${ERRCODE}" - printf "❌ Line : %s \n" "${ERRLINE}" - printf "❌ Script : %s \n" "${ERRSCRT}" - printf "❌ Function : %s \n" "${ERRFUNC}" - printf "❌ Command : %s \n" "${ERRCMMD}" - printf "❌ Script Runtime : %s \n" "${SECONDS}" - printf "❌ Arguments Counter : %s \n" "${ARGUMENTS_COUNT}" - printf "❌ Arguments Original : %s \n" "${ARG_STR_ORG_INPUT}" - printf "❌ Arguments Sanitized : %s \n" "${VAR_ARG_SANITIZED}" + printf "❌ Git Commit : %s \n" "${VAR_GIT_REL}" + printf "❌ Version : %s \n" "${VAR_VERSION}" + printf "❌ Hostsystem : %s \n" "${VAR_SYSTEM}" + printf "❌ Error : %s \n" "${ERRCODE}" + printf "❌ Line : %s \n" "${ERRLINE}" + printf "❌ Script : %s \n" "${ERRSCRT}" + printf "❌ Function : %s \n" "${ERRFUNC}" + printf "❌ Command : %s \n" "${ERRCMMD}" + printf "❌ Script Runtime : %s \n" "${SECONDS}" + printf "❌ Arguments Counter : %s \n" "${ARGUMENTS_COUNT}" + printf "❌ Arguments Original : %s \n" "${ARG_STR_ORG_INPUT}" + printf "❌ Arguments Sanitized : %s \n" "${VAR_ARG_SANITIZED}" if "${VAR_EARLY_DEBUG}"; then - printf "❌ Vars Dump saved at : %s \n" "${LOG_VAR}" - printf "❌ Debug Log saved at : %s \n" "${LOG_DEBUG}" - printf "❌ cat %s \n" "${LOG_DEBUG}" + printf "❌ Vars Dump saved at : %s \n" "${LOG_VAR}" + printf "❌ Debug Log saved at : %s \n" "${LOG_DEBUG}" + printf "❌ batcat --pager='less -r' %s \n" "${LOG_DEBUG}" fi printf "\n" } >> "${LOG_ERROR}" @@ -80,24 +80,24 @@ print_file_err() { ####################################### print_scr_err() { printf "\e[91m❌ CISS.debian.live.builder Script failed. \e[0m\n" >&2 - printf "\e[91m❌ Git Commit : %s \e[0m\n" "${VAR_GIT_REL}" >&2 - printf "\e[91m❌ Version : %s \e[0m\n" "${VAR_VERSION}" >&2 - printf "\e[91m❌ Hostsystem : %s \e[0m\n" "${VAR_SYSTEM}" >&2 - printf "\e[91m❌ Error : %s \e[0m\n" "${ERRCODE}" >&2 - printf "\e[91m❌ Line : %s \e[0m\n" "${ERRLINE}" >&2 - printf "\e[91m❌ Script : %s \e[0m\n" "${ERRSCRT}" >&2 - printf "\e[91m❌ Function : %s \e[0m\n" "${ERRFUNC}" >&2 - printf "\e[91m❌ Command : %s \e[0m\n" "${ERRCMMD}" >&2 - printf "\e[91m❌ Script Runtime : %s \e[0m\n" "${SECONDS}" >&2 - printf "\e[91m❌ Arguments Counter : %s \e[0m\n" "${ARGUMENTS_COUNT}" >&2 - printf "\e[91m❌ Arguments Original : %s \e[0m\n" "${ARG_STR_ORG_INPUT}" >&2 - printf "\e[91m❌ Arguments Sanitized : %s \e[0m\n" "${VAR_ARG_SANITIZED}" >&2 - printf "\e[91m❌ Error Log saved at : %s \e[0m\n" "${LOG_ERROR}" >&2 - printf "\e[91m❌ batcat %s \e[0m\n" "${LOG_ERROR}" >&2 + printf "\e[91m❌ Git Commit : %s \e[0m\n" "${VAR_GIT_REL}" >&2 + printf "\e[91m❌ Version : %s \e[0m\n" "${VAR_VERSION}" >&2 + printf "\e[91m❌ Hostsystem : %s \e[0m\n" "${VAR_SYSTEM}" >&2 + printf "\e[91m❌ Error : %s \e[0m\n" "${ERRCODE}" >&2 + printf "\e[91m❌ Line : %s \e[0m\n" "${ERRLINE}" >&2 + printf "\e[91m❌ Script : %s \e[0m\n" "${ERRSCRT}" >&2 + printf "\e[91m❌ Function : %s \e[0m\n" "${ERRFUNC}" >&2 + printf "\e[91m❌ Command : %s \e[0m\n" "${ERRCMMD}" >&2 + printf "\e[91m❌ Script Runtime : %s \e[0m\n" "${SECONDS}" >&2 + printf "\e[91m❌ Arguments Counter : %s \e[0m\n" "${ARGUMENTS_COUNT}" >&2 + printf "\e[91m❌ Arguments Original : %s \e[0m\n" "${ARG_STR_ORG_INPUT}" >&2 + printf "\e[91m❌ Arguments Sanitized : %s \e[0m\n" "${VAR_ARG_SANITIZED}" >&2 + printf "\e[91m❌ Error Log saved at : %s \e[0m\n" "${LOG_ERROR}" >&2 + printf "\e[91m❌ batcat --pager='less -r' %s \e[0m\n" "${LOG_ERROR}" >&2 if "${VAR_EARLY_DEBUG}"; then - printf "\e[91m❌ Vars Dump saved at : %s \e[0m\n" "${LOG_VAR}" >&2 - printf "\e[91m❌ Debug Log saved at : %s \e[0m\n" "${LOG_DEBUG}" >&2 - printf "\e[91m❌ batcat %s \e[0m\n" "${LOG_DEBUG}" >&2 + printf "\e[91m❌ Vars Dump saved at : %s \e[0m\n" "${LOG_VAR}" >&2 + printf "\e[91m❌ Debug Log saved at : %s \e[0m\n" "${LOG_DEBUG}" >&2 + printf "\e[91m❌ batcat --pager='less -r' %s \e[0m\n" "${LOG_DEBUG}" >&2 fi printf "\n" } diff --git a/lib/lib_trap_on_exit.sh b/lib/lib_trap_on_exit.sh index be89660..f72404d 100644 --- a/lib/lib_trap_on_exit.sh +++ b/lib/lib_trap_on_exit.sh @@ -50,14 +50,14 @@ print_scr_exit() { if [[ "${VAR_SCRIPT_SUCCESS}" == "true" ]]; then printf "\n" printf "\e[92m✅ CISS.debian.live.builder Script successful. \e[0m\n" - printf "\e[92m✅ Aide Initial DB at: %s \e[0m\n" "${VAR_HANDLER_BUILD_DIR}/.integrity/" - printf "\e[92m✅ Exited with Status: %s \e[0m\n" "${var_print_scr_exit_code}" + printf "\e[92m✅ Aide Initial DB at : %s \e[0m\n" "${VAR_HANDLER_BUILD_DIR}/.integrity/" + printf "\e[92m✅ Exited with Status : %s \e[0m\n" "${var_print_scr_exit_code}" printf "\n" if [[ "${VAR_EARLY_DEBUG}" == "true" ]]; then - printf "\e[92m✅ Script Runtime : %s \e[0m\n" "${SECONDS}" - printf "\e[92m✅ Vars Dump saved at: %s \e[0m\n" "${LOG_VAR}" - printf "\e[92m✅ Debug Log saved at: %s \e[0m\n" "${LOG_DEBUG}" - printf "\e[92m✅ batcat %s \e[0m\n" "${LOG_DEBUG}" + printf "\e[92m✅ Script Runtime : %s \e[0m\n" "${SECONDS}" + printf "\e[92m✅ Vars Dump saved at : %s \e[0m\n" "${LOG_VAR}" + printf "\e[92m✅ Debug Log saved at : %s \e[0m\n" "${LOG_DEBUG}" + printf "\e[92m✅ batcat --pager='less -r' %s \e[0m\n" "${LOG_DEBUG}" printf "\n" fi printf "\e[95m💷 Please consider donating to my work at: \e[0m\n"