From cc7be4d8f46561c9cf6effaf8039349d095fd578 Mon Sep 17 00:00:00 2001 From: Pascal Eckmann Date: Wed, 9 Dec 2020 12:00:45 +0100 Subject: [PATCH] Fix architecture detection after extraction of fw binary --- emba.sh | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/emba.sh b/emba.sh index 349af302..d5257a3a 100755 --- a/emba.sh +++ b/emba.sh @@ -173,10 +173,6 @@ main() log_folder set_exclude - - if [[ $KERNEL -eq 0 && $PRE_CHECK -eq 0 ]] ; then - architecture_check - fi fi dependency_check @@ -196,7 +192,8 @@ main() if [[ $PRE_CHECK -eq 1 ]] ; then if [[ -f "$FIRMWARE_PATH" ]]; then - print_output "[!] Test started on ""$(date)""\\n""$(indent "$NC""Firmware binary path: ""$FIRMWARE_PATH")" "no_log" + echo + print_output "[!] Extraction started on ""$(date)""\\n""$(indent "$NC""Firmware binary path: ""$FIRMWARE_PATH")" "no_log" # 'main' functions of imported modules # in the pre-check phase we execute all modules with P[Number]_Name.sh @@ -222,12 +219,23 @@ main() fi done fi + + echo + print_output "[!] Extraction ended on ""$(date)"" and took about ""$(date -d@$SECONDS -u +%H:%M:%S)"" \\n" "no_log" + fi fi if [[ $FIRMWARE -eq 1 ]] ; then if [[ -d "$FIRMWARE_PATH" ]]; then + echo + print_output "=================================================================\n" "no_log" + + if [[ $KERNEL -eq 0 ]] ; then + architecture_check + fi + check_firmware prepare_binary_arr