diff --git a/lib/functions/compilation/kernel-patching.sh b/lib/functions/compilation/kernel-patching.sh index f062304bd9..8ea83aef3c 100644 --- a/lib/functions/compilation/kernel-patching.sh +++ b/lib/functions/compilation/kernel-patching.sh @@ -46,7 +46,9 @@ function kernel_main_patching_python() { display_alert "Calling Python patching script" "for kernel" "info" declare python3_binary_path prepare_python3_binary_for_python_tools - run_host_command_logged env -i "${params_quoted[@]@Q}" "${python3_binary_path}" "${SRC}/lib/tools/patching.py" + # "raw_command" is only for logging purposes. + raw_command="[...shortened kernel...] ${python3_binary_path} ${SRC}/lib/tools/patching.py" \ + run_host_command_logged env -i "${params_quoted[@]@Q}" "${python3_binary_path}" "${SRC}/lib/tools/patching.py" run_host_command_logged cat "${temp_file_for_output}" # shellcheck disable=SC1090 source "${temp_file_for_output}" # SOURCE IT! diff --git a/lib/functions/compilation/uboot-patching.sh b/lib/functions/compilation/uboot-patching.sh index 92f9c36d95..a39468dc6f 100644 --- a/lib/functions/compilation/uboot-patching.sh +++ b/lib/functions/compilation/uboot-patching.sh @@ -32,7 +32,9 @@ function uboot_main_patching_python() { display_alert "Calling Python patching script" "for u-boot target" "info" declare python3_binary_path prepare_python3_binary_for_python_tools - run_host_command_logged env -i "${params_quoted[@]@Q}" "${python3_binary_path}" "${SRC}/lib/tools/patching.py" + # "raw_command" is only for logging purposes. + raw_command="[...shortened u-boot...] ${python3_binary_path} ${SRC}/lib/tools/patching.py" \ + run_host_command_logged env -i "${params_quoted[@]@Q}" "${python3_binary_path}" "${SRC}/lib/tools/patching.py" run_host_command_logged cat "${temp_file_for_output}" # shellcheck disable=SC1090 source "${temp_file_for_output}" # SOURCE IT! diff --git a/lib/functions/configuration/aggregation.sh b/lib/functions/configuration/aggregation.sh index 8ee5b70a4c..6664a0d243 100644 --- a/lib/functions/configuration/aggregation.sh +++ b/lib/functions/configuration/aggregation.sh @@ -74,7 +74,9 @@ function aggregate_all_packages_python() { ) declare python3_binary_path prepare_python3_binary_for_python_tools - run_host_command_logged env -i "${aggregation_params_quoted[@]@Q}" "${python3_binary_path}" "${SRC}/lib/tools/aggregation.py" + # "raw_command" is only for logging purposes. + raw_command="[...shortened...] ${python3_binary_path} ${SRC}/lib/tools/aggregation.py" \ + run_host_command_logged env -i "${aggregation_params_quoted[@]@Q}" "${python3_binary_path}" "${SRC}/lib/tools/aggregation.py" #run_host_command_logged cat "${temp_file_for_aggregation}" # shellcheck disable=SC1090 source "${temp_file_for_aggregation}" # SOURCE IT! diff --git a/lib/functions/logging/runners.sh b/lib/functions/logging/runners.sh index 7f8756ebb7..d86a7178c1 100644 --- a/lib/functions/logging/runners.sh +++ b/lib/functions/logging/runners.sh @@ -183,7 +183,7 @@ function run_host_x86_binary_logged() { # run_host_command_logged is the very basic, should be used for everything, but, please use helpers above, this is very low-level. function run_host_command_logged() { - raw_command="$*" run_host_command_logged_raw /bin/bash -e -o pipefail -c "$*" + raw_command="${raw_command:-"$*"}" run_host_command_logged_raw /bin/bash -e -o pipefail -c "$*" } # for interactive, dialog-like host-side invocations. no redirections performed, but same bash usage and expansion, for consistency.