Skip to content

Commit

Permalink
Merge branch 'pre-checker' of github.com:m-1-k-3/emba into pre-checker
Browse files Browse the repository at this point in the history
  • Loading branch information
m-1-k-3 committed Dec 9, 2020
2 parents 40d8d10 + cc7be4d commit 988da5f
Showing 1 changed file with 13 additions and 5 deletions.
18 changes: 13 additions & 5 deletions emba.sh
Original file line number Diff line number Diff line change
Expand Up @@ -173,10 +173,6 @@ main()
log_folder

set_exclude

if [[ $KERNEL -eq 0 && $PRE_CHECK -eq 0 ]] ; then
architecture_check
fi
fi

dependency_check
Expand All @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 988da5f

Please sign in to comment.