diff --git a/.gitea/trigger/t_generate_PRIVATE_trixie.yaml b/.gitea/trigger/t_generate_PRIVATE_trixie.yaml index 403d0b4..b192b23 100644 --- a/.gitea/trigger/t_generate_PRIVATE_trixie.yaml +++ b/.gitea/trigger/t_generate_PRIVATE_trixie.yaml @@ -10,6 +10,6 @@ # SPDX-Security-Contact: security@coresecret.eu build: - counter: 1024 + counter: 1023 version: V8.13.008.2025.08.22 # vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=yaml diff --git a/.gitea/workflows/generate_PRIVATE_trixie.yaml b/.gitea/workflows/generate_PRIVATE_trixie.yaml index 7613269..2e2c963 100644 --- a/.gitea/workflows/generate_PRIVATE_trixie.yaml +++ b/.gitea/workflows/generate_PRIVATE_trixie.yaml @@ -39,7 +39,6 @@ jobs: apt-get update -y apt-get upgrade -y apt-get install -y --no-install-recommends \ - apt-transport-https \ apt-utils \ bash \ ca-certificates \ diff --git a/lib/lib_arg_priority_check.sh b/lib/lib_arg_priority_check.sh index 10a1ec3..55bc30b 100644 --- a/lib/lib_arg_priority_check.sh +++ b/lib/lib_arg_priority_check.sh @@ -23,22 +23,30 @@ guard_sourcing ####################################### arg_priority_check() { declare var - # Check if nice PRIORITY is set and adjust nice priority. - if [[ -n ${VAR_HANDLER_PRIORITY} ]]; then - renice "${VAR_HANDLER_PRIORITY}" -p "$$" - var=$(ps -o ni= -p $$) > /dev/null 2>&1 - printf "\e[92m++++ ++++ ++++ ++++ ++++ ++++ ++ ✅ New renice value: %s\e[0m\n" "${var}" - # sleep 1 - unset var + ### Check if nice PRIORITY is set and adjust nice priority. + if [[ -n ${VAR_HANDLER_PRIORITY:-} ]]; then + if command -v renice >/dev/null; then + renice "${VAR_HANDLER_PRIORITY}" -p "$$" + var=$(ps -o ni= -p $$) > /dev/null 2>&1 + printf "\e[92m++++ ++++ ++++ ++++ ++++ ++++ ++ ✅ New renice value: %s\e[0m\n" "${var}" + # sleep 1 + unset var + else + printf "\e[92m++++ ++++ ++++ ++++ ++++ ++++ ++ ⚠️ renice not installed (util-linux) \e[0m\n" + fi fi - # Check if ionice PRIORITY is set and adjust ionice priority. - if [[ -n ${VAR_REIONICE_CLASS} ]]; then - ionice -c"${VAR_REIONICE_CLASS:-2}" -n"${VAR_REIONICE_PRIORITY:-4}" -p "$$" - var=$(ionice -p $$) > /dev/null 2>&1 - printf "\e[92m++++ ++++ ++++ ++++ ++++ ++++ ++ ✅ New ionice value: %s\e[0m\n" "${var}" - # sleep 1 - unset var + ### Check if ionice PRIORITY is set and adjust ionice priority. + if [[ -n ${VAR_REIONICE_CLASS:-} ]]; then + if command -v ionice >/dev/null; then + ionice -c"${VAR_REIONICE_CLASS:-2}" -n"${VAR_REIONICE_PRIORITY:-4}" -p "$$" + var=$(ionice -p $$) > /dev/null 2>&1 + printf "\e[92m++++ ++++ ++++ ++++ ++++ ++++ ++ ✅ New ionice value: %s\e[0m\n" "${var}" + # sleep 1 + unset var + else + printf "\e[92m++++ ++++ ++++ ++++ ++++ ++++ ++ ⚠️ ionice not installed (util-linux) \e[0m\n" + fi fi } # vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=sh diff --git a/lib/lib_trap_on_err.sh b/lib/lib_trap_on_err.sh index becaa37..3bd737f 100644 --- a/lib/lib_trap_on_err.sh +++ b/lib/lib_trap_on_err.sh @@ -16,7 +16,7 @@ guard_sourcing # Print Error Message for Trap on 'ERR' in ${ERROR_LOG} # Globals: # VAR_PARAM_COUNT -# VAR_PARAM_STRING +# VAR_PARAM_STRNG # VAR_ARG_SANITIZED # LOG_DEBUG # ERRCMMD @@ -46,7 +46,7 @@ print_file_err() { printf "❌ Command : %s \n" "${ERRCMMD}" printf "❌ Script Runtime : %s \n" "${SECONDS}" printf "❌ Arguments Counter : %s \n" "${VAR_PARAM_COUNT}" - printf "❌ Arguments Original : %s \n" "${VAR_PARAM_STRING}" + printf "❌ Arguments Original : %s \n" "${VAR_PARAM_STRNG}" printf "❌ Arguments Sanitized : %s \n" "${VAR_ARG_SANITIZED}" if "${VAR_EARLY_DEBUG}"; then printf "❌ Vars Dump saved at : %s \n" "${LOG_VAR}" @@ -61,7 +61,7 @@ print_file_err() { # Print Error Message for Trap on 'ERR' on Terminal # Globals: # VAR_PARAM_COUNT -# VAR_PARAM_STRING +# VAR_PARAM_STRNG # VAR_ARG_SANITIZED # LOG_DEBUG # ERRCMMD @@ -90,7 +90,7 @@ print_scr_err() { 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" "${VAR_PARAM_COUNT}" >&2 - printf "\e[91m❌ Arguments Original : %s \e[0m\n" "${VAR_PARAM_STRING}" >&2 + printf "\e[91m❌ Arguments Original : %s \e[0m\n" "${VAR_PARAM_STRNG}" >&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 diff --git a/var/global.var.sh b/var/global.var.sh index 114744d..2314a76 100644 --- a/var/global.var.sh +++ b/var/global.var.sh @@ -36,7 +36,6 @@ declare -g VAR_SSHPORT="" declare -g VAR_SSHPUBKEY="" declare -g VAR_SCRIPT_SUCCESS="false" declare -g VAR_SUITE="bookworm" -declare -g VAR_HANDLER_PRIORITY="" declare -g VAR_HANDLER_NETCUP_IPV6="false" declare -g VAR_HASHED_PWD="" declare -gi VAR_HANDLER_STA=0