Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

check for space at the end of a line #845

Merged
merged 1 commit into from
Oct 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 11 additions & 0 deletions check_project.sh
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,17 @@ check() {
fi
done

echo -e "\\n""${GREEN}""Check all source for correct space usage:""${NC}""\\n"
for SOURCE in "${SOURCES[@]}"; do
echo -e "\\n""${GREEN}""Run ${ORANGE}space check${GREEN} on ${ORANGE}${SOURCE}""${NC}""\\n"
if ! grep -q -E ' +$' "${SOURCE}"; then
echo -e "${GREEN}""${BOLD}""==> SUCCESS""${NC}""\\n"
else
grep -E -H -n ' +$' "${SOURCE}"
echo -e "\\n""${ORANGE}""${BOLD}""==> FIX ERRORS""${NC}""\\n"
MODULES_TO_CHECK_ARR_COMMENT+=("${SOURCE}")
fi
done

echo -e "\\n""${GREEN}""Run shellcheck and semgrep:""${NC}""\\n"
for SOURCE in "${SOURCES[@]}"; do
Expand Down
14 changes: 7 additions & 7 deletions emba
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ run_modules()
}

main() {
set -a
set -a
trap cleaner INT

INVOCATION_PATH="$(dirname "${0}")"
Expand Down Expand Up @@ -917,7 +917,7 @@ main() {
print_output "\n=================================================================\n" "no_log"

if [[ -d "${LOG_DIR}" ]]; then
print_output "[!] Testing phase started on ""$(date)""\\n""$(indent "${NC}""Firmware path: ""${FIRMWARE_PATH}")" "main"
print_output "[!] Testing phase started on ""$(date)""\\n""$(indent "${NC}""Firmware path: ""${FIRMWARE_PATH}")" "main"
else
print_output "[!] Testing phase started on ""$(date)""\\n""$(indent "${NC}""Firmware path: ""${FIRMWARE_PATH}")" "no_log"
fi
Expand Down Expand Up @@ -946,7 +946,7 @@ main() {
if [[ "${FULL_EMULATION}" -eq 1 ]] && [[ "${DIFF_MODE}" -ne 1 ]]; then
print_output "\n=================================================================\n" "no_log"
if [[ -d "${LOG_DIR}" ]]; then
print_output "[!] System emulation phase started on ""$(date)""\\n""$(indent "${NC}""Firmware path: ""${FIRMWARE_PATH}")" "main"
print_output "[!] System emulation phase started on ""$(date)""\\n""$(indent "${NC}""Firmware path: ""${FIRMWARE_PATH}")" "main"
else
print_output "[!] System emulation phase started on ""$(date)""\\n""$(indent "${NC}""Firmware path: ""${FIRMWARE_PATH}")" "no_log"
fi
Expand All @@ -969,12 +969,12 @@ main() {
# Reporting (F-modules)
#######################################################################################
if [[ -d "${LOG_DIR}" ]]; then
print_output "[!] Reporting phase started on ""$(date)""\\n" "main"
print_output "[!] Reporting phase started on ""$(date)""\\n" "main"
else
print_output "[!] Reporting phase started on ""$(date)""\\n" "no_log"
print_output "[!] Reporting phase started on ""$(date)""\\n" "no_log"
fi
write_notification "Reporting phase started"

run_modules "F" "0" "${HTML}"

[[ ${DISABLE_STATUS_BAR} -eq 0 ]] && remove_status_bar
Expand All @@ -987,7 +987,7 @@ main() {

if [[ "${TESTING_DONE}" -eq 1 ]]; then
if [[ "${FINAL_FW_RM}" -eq 1 && -d "${LOG_DIR}"/firmware ]]; then
print_output "[*] Removing temp firmware directory\\n" "no_log"
print_output "[*] Removing temp firmware directory\\n" "no_log"
rm -r "${LOG_DIR}"/firmware 2>/dev/null
fi
if [[ "${FINAL_FW_RM}" -eq 1 && -d "${LOG_DIR}"/p61_unblob_eval/unblob_extracted ]]; then
Expand Down
2 changes: 1 addition & 1 deletion helpers/fixImage_user_mode_emulation.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh

# This script is based on the firmadyne script:
# This script is based on the firmadyne script:
# https://github.com/firmadyne/firmadyne/blob/master/scripts/fixImage.sh

# use busybox statically-compiled version of all binaries
Expand Down
12 changes: 6 additions & 6 deletions helpers/helpers_emba_dependency_check.sh
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ setup_nikto() {
fi
}

dependency_check()
dependency_check()
{
module_title "Dependency check" "no_log"

Expand All @@ -208,7 +208,7 @@ dependency_check()

if [[ "${CONTAINER_NUMBER}" -ne 1 ]]; then
print_output " Internet connection - \\c" "no_log"

if [[ -n "${PROXY_SETTINGS}" ]]; then
export http_proxy="${PROXY_SETTINGS}"
export https_proxy="${PROXY_SETTINGS}"
Expand Down Expand Up @@ -340,7 +340,7 @@ dependency_check()
fi

# EMBA is developed for and on KALI Linux
# In our experience we can say that it runs on most Debian based systems without any problems
# In our experience we can say that it runs on most Debian based systems without any problems
if [[ $USE_DOCKER -eq 0 ]] ; then
print_output " host distribution - \\c" "no_log"
if grep -q "kali" /etc/debian_version 2>/dev/null ; then
Expand Down Expand Up @@ -416,7 +416,7 @@ dependency_check()
echo -e "$GREEN""ok""$NC"
fi
fi
done
done


#######################################################################################
Expand Down Expand Up @@ -531,10 +531,10 @@ dependency_check()

check_dep_tool "ubireader image extractor" "ubireader_extract_images"
check_dep_tool "ubireader file extractor" "ubireader_extract_files"

# UEFI
check_dep_tool "UEFI image extractor" "$EXT_DIR""/UEFITool/UEFIExtract"

if function_exists F20_vul_aggregator; then
# CVE-search
# TODO change to portcheck and write one for external hosts
Expand Down
32 changes: 16 additions & 16 deletions helpers/helpers_emba_html_generator.sh
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ add_link_tags() {
LINK_COMMAND_ARR=()
local WAIT_PIDS_WR=()

# [REF] anchor
# [REF] anchor
if ( grep -a -q -E '\[REF\]' "$LINK_FILE" ) ; then
readarray -t REF_LINKS_L_NUMBER < <(grep -a -n -E '\[REF\].*' "$LINK_FILE" | cut -d':' -f1 )
for REF_LINK_NUMBER in "${REF_LINKS_L_NUMBER[@]}" ; do
Expand All @@ -110,7 +110,7 @@ add_link_tags() {
HTML_LINK="$(echo "$REFERENCE_LINK" | sed -e "s@LINK@${DEPTH}/$(echo "$BACK_LINK" | cut -d"." -f1)/$(basename "${REF_LINK%."${REF_LINK##*.}"}").html@g" || true)"
fi
LINE_NUMBER_INFO_PREV="$(( REF_LINK_NUMBER - 1 ))"
while [[ ("$(sed "$LINE_NUMBER_INFO_PREV""q;d" "$LINK_FILE")" == "$P_START$SPAN_END$P_END") || ("$(sed "$LINE_NUMBER_INFO_PREV""q;d" "$LINK_FILE")" == "$BR" ) ]] ; do
while [[ ("$(sed "$LINE_NUMBER_INFO_PREV""q;d" "$LINK_FILE")" == "$P_START$SPAN_END$P_END") || ("$(sed "$LINE_NUMBER_INFO_PREV""q;d" "$LINK_FILE")" == "$BR" ) ]] ; do
LINE_NUMBER_INFO_PREV=$(( LINE_NUMBER_INFO_PREV - 1 ))
done
LINK_COMMAND_ARR+=( "$LINE_NUMBER_INFO_PREV"'s@^@'"$HTML_LINK"'@' "$LINE_NUMBER_INFO_PREV"'s@$@'"$LINK_END"'@')
Expand Down Expand Up @@ -150,14 +150,14 @@ add_link_tags() {
HTML_LINK="$(echo "$REFERENCE_MODUL_LINK" | sed -e "s@LINK@./$(basename "${MODUL_ARR_LINK_E%.sh}").html@" || true)"
fi
LINE_NUMBER_INFO_PREV="$(( REF_LINK_NUMBER - 1 ))"
while [[ "$(sed "$LINE_NUMBER_INFO_PREV""q;d" "$LINK_FILE")" == "$P_START$SPAN_END$P_END" ]] ; do
while [[ "$(sed "$LINE_NUMBER_INFO_PREV""q;d" "$LINK_FILE")" == "$P_START$SPAN_END$P_END" ]] ; do
LINE_NUMBER_INFO_PREV=$(( LINE_NUMBER_INFO_PREV - 1 ))
done
LINK_COMMAND_ARR+=( "$LINE_NUMBER_INFO_PREV"'s@^@'"$HTML_LINK"'@' "$LINE_NUMBER_INFO_PREV"'s@$@'"$LINK_END"'@')
fi
elif [[ "$REF_LINK" =~ $URL_REGEX ]] ; then
LINE_NUMBER_INFO_PREV="$(( REF_LINK_NUMBER - 1 ))"
while [[ ("$(sed "$LINE_NUMBER_INFO_PREV""q;d" "$LINK_FILE")" == "$P_START$SPAN_END$P_END") || ("$(sed "$LINE_NUMBER_INFO_PREV""q;d" "$LINK_FILE")" == "$BR" ) ]] ; do
while [[ ("$(sed "$LINE_NUMBER_INFO_PREV""q;d" "$LINK_FILE")" == "$P_START$SPAN_END$P_END") || ("$(sed "$LINE_NUMBER_INFO_PREV""q;d" "$LINK_FILE")" == "$BR" ) ]] ; do
LINE_NUMBER_INFO_PREV=$(( LINE_NUMBER_INFO_PREV - 1 ))
done
HTML_LINK="$(echo "$REFERENCE_MODUL_EXT_LINK" | sed -e "s@LINK@$REF_LINK@")""$(sed "$LINE_NUMBER_INFO_PREV""q;d" "$LINK_FILE")""$LINK_END"
Expand All @@ -168,7 +168,7 @@ add_link_tags() {
done
fi

if [[ $IGNORE_LINKS -eq 0 ]] ; then
if [[ $IGNORE_LINKS -eq 0 ]] ; then
# web links
if ( grep -a -q -E '(https?|ftp|file):\/\/' "$LINK_FILE" ) ; then
readarray -t WEB_LINKS < <( grep -a -n -o -E '(\b(https?|ftp|file):\/\/) ?[-A-Za-z0-9+&@#\/%?=~_|!:,.;]+[-A-Za-z0-9+&@#\/%=~a_|]' "$LINK_FILE" | uniq || true)
Expand All @@ -186,7 +186,7 @@ add_link_tags() {
# linux exploit suggester links
if ( grep -a -q -E 'Exploit \(linux-exploit-suggester' "$LINK_FILE" ) ; then
readarray -t LES_LINE_ARR < <( grep -a -o -n -E 'Exploit \(linux-exploit-suggester' "$LINK_FILE" | cut -d":" -f1)
for LES_LINE in "${LES_LINE_ARR[@]}" ; do
for LES_LINE in "${LES_LINE_ARR[@]}" ; do
HTML_LINK="$(echo "$LOCAL_LINK" | sed -e "s@LINK@./s25_kernel_check.html@g")""linux-exploit-suggester""$LINK_END"
LINK_COMMAND_ARR+=( "$LES_LINE""s@linux-exploit-suggester@""$HTML_LINK"'@' )
done
Expand Down Expand Up @@ -227,7 +227,7 @@ add_link_tags() {
# MSF key links and additional files
if ( grep -a -q -E 'Exploit.*MSF' "$LINK_FILE" ) ; then
readarray -t MSF_KEY_F < <( grep -a -n -o -E "MSF: (([0-9a-z_][\ ]?)+)*" "$LINK_FILE" | uniq || true)
for MSF_KEY in "${MSF_KEY_F[@]}" ; do
for MSF_KEY in "${MSF_KEY_F[@]}" ; do
MSF_KEY_LINE="$(echo "$MSF_KEY" | cut -d ":" -f 1)"
MSF_KEY_STRING="$(echo "$MSF_KEY" | cut -d ":" -f 3- | sed -e 's/^[[:space:]]*//')"
readarray -t MSF_KEY_STRING_ARR < <(echo "$MSF_KEY_STRING" | tr " " "\n" | uniq )
Expand All @@ -244,13 +244,13 @@ add_link_tags() {
fi
done
done
fi
fi

# Trickest key links to Github
# Todo: Remove trickest integration
if ( grep -a -q -E 'Exploit.*Github' "$LINK_FILE" ) ; then
readarray -t TRICKEST_KEY_F < <( grep -a -n -o -E "Github: .*" "$LINK_FILE" | sed 's/ (G)//g' | sed 's/Github: //' | sed 's/).*//' | uniq || true)
for TRICKEST_KEY in "${TRICKEST_KEY_F[@]}" ; do
for TRICKEST_KEY in "${TRICKEST_KEY_F[@]}" ; do
TRICKEST_ID_LINE="$(echo "$TRICKEST_KEY" | cut -d ":" -f 1)"
TRICKEST_ID_STRING="$(echo "$TRICKEST_KEY" | cut -d ":" -f 2-)"
readarray -t TRICKEST_KEY_STRING_ARR < <(echo "$TRICKEST_ID_STRING" | tr " " "\n" | uniq)
Expand All @@ -262,7 +262,7 @@ add_link_tags() {
LINK_COMMAND_ARR+=( "$TRICKEST_ID_LINE"'s@'"$TRICKEST_KEY_ELEM"'@'"$HTML_LINK"'@' )
done
done
fi
fi

if ( grep -a -q -E 'Exploit.*Snyk' "$LINK_FILE" ) ; then
readarray -t SNYK_KEY_F < <( grep -a -n -o -E "Snyk: .*" "$LINK_FILE" | sed 's/Snyk: //' | uniq || true)
Expand Down Expand Up @@ -476,7 +476,7 @@ generate_info_file()
# add html tags for style
add_color_tags "$TMP_INFO_FILE"
sed -i -e "s:[=]{65}:$HR_DOUBLE:g ; s:^[-]{65}$:$HR_MONO:g" "$TMP_INFO_FILE" || true

# add link tags to links/generate info files and link to them and write line to tmp file
add_link_tags "$TMP_INFO_FILE" "${INFO_HTML_FILE}"

Expand Down Expand Up @@ -560,7 +560,7 @@ generate_report_file()
sed -i -e "s:^:$P_START: ; s:$:$P_END:" "$TMP_FILE" || true
# this fixes the </pre> lines instead of <pre></pre> - something weird with \r\n
sed -i -E "s:\r$P_END:$P_END:" "$TMP_FILE" || true

# add html tags for style
add_color_tags "$TMP_FILE"

Expand Down Expand Up @@ -608,7 +608,7 @@ add_link_to_index() {
readarray -t INDEX_NAV_GROUP_ARR < <(printf -- '%s\n' "${INDEX_NAV_ARR[@]}" | grep -a "$CLASS" || true)

if [[ ${#INDEX_NAV_GROUP_ARR[@]} -eq 0 ]] ; then
# due the design of EMBA, which are already groups the modules (even threaded), it isn't necessary to check -
# due the design of EMBA, which are already groups the modules (even threaded), it isn't necessary to check -
# insert new entry at bottom of the navigation
insert_line "navigation end" "$MODUL_NAME"
else
Expand Down Expand Up @@ -636,7 +636,7 @@ update_index()
generate_report_file "$MAIN_LOG"
sed -i -e "s@buttonTimeInvisible@buttonTime@ ; s@TIMELINK@.\/$(basename "${MAIN_LOG%."${MAIN_LOG##*.}"}"".html")@" "$ABS_HTML_PATH""/""$INDEX_FILE"

# generate files in $SUPPL_PATH (supplementary files from modules)
# generate files in $SUPPL_PATH (supplementary files from modules)
readarray -t SUPPL_FILES < <(find "$SUPPL_PATH" ! -path "$SUPPL_PATH")
if [[ "${#SUPPL_FILES[@]}" -gt 0 ]] ; then
sed -i 's@expand_njs hidden@expand_njs@g' "$ABS_HTML_PATH""/""$INDEX_FILE"
Expand Down Expand Up @@ -688,7 +688,7 @@ add_arrows()
readarray -t Q_MODULE_ARR < <(find "$ABS_HTML_PATH" -maxdepth 1 -name "*.html" | grep -a -E "./q[0-9]*.*" | sort -V || true)
local ALL_MODULE_ARR
ALL_MODULE_ARR=( "$ABS_HTML_PATH""/""$INDEX_FILE" "${D_MODULE_ARR[@]}" "${P_MODULE_ARR[@]}" "${S_MODULE_ARR[@]}" "${Q_MODULE_ARR[@]}" "${L_MODULE_ARR[@]}" "${F_MODULE_ARR[@]}")
for M_NUM in "${!ALL_MODULE_ARR[@]}"; do
for M_NUM in "${!ALL_MODULE_ARR[@]}"; do
if [[ "$M_NUM" -gt 0 ]] ; then
FIRST_LINK="${ALL_MODULE_ARR[$(( M_NUM - 1 ))]}"
LINE_NUMBER_A_BUTTON=$(grep -a -m 1 -n "buttonForward" "${ALL_MODULE_ARR[$M_NUM]}" | cut -d ":" -f 1 || true)
Expand All @@ -707,7 +707,7 @@ add_arrows()
prepare_report()
{
ABS_HTML_PATH="$(abs_path "$HTML_PATH")"

if [ ! -d "$ABS_HTML_PATH$STYLE_PATH" ] ; then
mkdir -p "$ABS_HTML_PATH$STYLE_PATH" || true
cp "$HELP_DIR/style.css" "$ABS_HTML_PATH$STYLE_PATH/style.css" || true
Expand Down
6 changes: 3 additions & 3 deletions helpers/helpers_emba_internet_access.sh
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ kernel_downloader() {
local K_VER_1st=""
local K_VER_2nd=""
# local K_VER_3rd=""

K_VER_1st=$(echo "$K_VERSION" | cut -d. -f1)
K_VER_2nd=$(echo "$K_VERSION" | cut -d. -f2)
# K_VER_3rd=$(echo "$K_VERSION" | cut -d. -f3)
Expand All @@ -75,7 +75,7 @@ kernel_downloader() {
# for download we need to modify versions like 3.1.0 to 3.1
K_VERSION=${K_VERSION%.0}
fi

# we check if the sources archive is already available and is a valid tgz file:
if ! [[ -f "$KERNEL_ARCH_PATH"/linux-"$K_VERSION".tar.gz ]] || ! gunzip -t "$KERNEL_ARCH_PATH/linux-$K_VERSION.tar.gz" > /dev/null; then
local OUTPUTTER="[*] Kernel download for version $ORANGE$K_VERSION$NC"
Expand Down Expand Up @@ -114,7 +114,7 @@ kernel_downloader() {
print_output "$OUTPUTTER" "no_log"
write_log "$OUTPUTTER" "$LOG_DIR/kernel_downloader.log"
fi

if ! [[ -f "$KERNEL_ARCH_PATH"/linux-"$K_VERSION".tar.gz ]]; then
local OUTPUTTER="[-] Kernel sources not available ..."
print_output "$OUTPUTTER" "no_log"
Expand Down
2 changes: 1 addition & 1 deletion helpers/helpers_emba_status_bar.sh
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ system_load_util_str() {
}

# Update first box "SYSTEM LOAD"
# we need to use the tmp file for the cpu load, because it takes about a second to get the information and therefore we
# we need to use the tmp file for the cpu load, because it takes about a second to get the information and therefore we
# load this information in the background, write it to the file in a rythm of .2s and when needed, it will be readed from it
update_box_system_load() {
update_cpu() {
Expand Down
6 changes: 3 additions & 3 deletions helpers/packet_storm_crawler.sh
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ if [[ -f "${EMBA_CONFIG_PATH}"/PS_PoC_results.csv ]]; then
ENTRIES_BEFORE="$(wc -l "${EMBA_CONFIG_PATH}"/PS_PoC_results.csv | awk '{print $1}')"
echo -e "${GREEN}[+] Current Packetstorm PoC file has ${ORANGE}${ENTRIES_BEFORE}${GREEN} exploit entries.${NC}"
fi

echo "[*] Generating URL list for packetstorm advisories"
ID=1

Expand All @@ -50,7 +50,7 @@ while ( true ); do
FAIL_CNT=0

# Download and error handling:
while ! lynx -dump -hiddenlinks=listonly "${URL}""${ID}" > "${SAVE_PATH}"/"${LINKS}"; do
while ! lynx -dump -hiddenlinks=listonly "${URL}""${ID}" > "${SAVE_PATH}"/"${LINKS}"; do
((CUR_SLEEP_TIME+=$(shuf -i 1-5 -n 1)))
((FAIL_CNT+=1))
if [[ "${FAIL_CNT}" -gt 20 ]]; then
Expand Down Expand Up @@ -122,7 +122,7 @@ while ( true ); do
TYPE="DoS"
fi
fi

mapfile -t CVEs < <(sed '/\['"${CURRENT_MARKER}"'\]/,/\['"${NEXT_MARKER}"'\]/!d' "${SAVE_PATH}"/"${LINKS}" \
| grep -o -E "\[[0-9]+\]CVE-[0-9]+-[0-9]+" | sed 's/\[[0-9]*\]//' | sort -u)
if [[ -v CVEs ]]; then
Expand Down
2 changes: 1 addition & 1 deletion helpers/running_modules.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# Author(s): Michael Messner

# Description: EMBA helper script to identify currently running EMBA modules
# start it with "watch". E.g.,
# start it with "watch". E.g.,
# watch -c ./helpers/running_modules.sh ~/firmware-stuff/emba_logs_dir300_new_bins


Expand Down
2 changes: 1 addition & 1 deletion installer.sh
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ if ! grep -Eq "ID(_LIKE)?=(\")?(ubuntu)?( )?(debian)?" /etc/os-release 2>/dev/nu
print_help
exit 1
elif ! grep -q "kali" /etc/debian_version 2>/dev/null ; then
if grep -q "VERSION_ID=\"22.04\"" /etc/os-release 2>/dev/null ; then
if grep -q "VERSION_ID=\"22.04\"" /etc/os-release 2>/dev/null ; then
# How to handle sub-versioning ? if grep -q -E "PRETTY_NAME=\"Ubuntu\ 22\.04(\.[0-9]+)?\ LTS\"" /etc/os-release 2>/dev/null ; then
OTHER_OS=1
UBUNTU_OS=1
Expand Down
2 changes: 1 addition & 1 deletion installer/I01_default_apps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ I01_default_apps(){
else
echo -e "$RED""$BOLD""Not installing metasploit-framework. Your EMBA installation will be incomplete""$NC"
fi

if [[ "$LIST_DEP" -eq 1 ]] || [[ $DOCKER_SETUP -eq 1 ]] ; then
ANSWER=("n")
else
Expand Down
2 changes: 1 addition & 1 deletion installer/I01_default_apps_host.sh
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,4 @@ I01_default_apps_host() {
pip_install "requests" "-U"
;;
esac
}
}
8 changes: 4 additions & 4 deletions installer/I02_UEFI_fwhunt.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,17 @@ I02_UEFI_fwhunt() {
print_git_info "fwhunt-scan" "EMBA-support-repos/fwhunt-scan" "Tools for analyzing UEFI firmware and checking UEFI modules with FwHunt rules."
print_git_info "fwhunt-rules" "EMBA-support-repos/FwHunt" "The Binarly Firmware Hunt (FwHunt) rule format was designed to scan for known vulnerabilities in UEFI firmware."
print_git_info "BIOSUtilities" "EMBA-support-repos/BIOSUtilities" "Various BIOS Utilities for Modding/Research"

if [[ "$LIST_DEP" -eq 1 ]] || [[ $DOCKER_SETUP -eq 1 ]] ; then
ANSWER=("n")
else
echo -e "\\n""$MAGENTA""$BOLD""These applications (if not already on the system) will be downloaded!""$NC"
ANSWER=("y")
fi

case ${ANSWER:0:1} in
y|Y )

pip_install "rzpipe"
pip_install "click"
pip_install "pyyaml"
Expand Down Expand Up @@ -85,4 +85,4 @@ I02_UEFI_fwhunt() {
;;
esac
fi
}
}
2 changes: 1 addition & 1 deletion installer/I05_emba_docker_image_dl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ I05_emba_docker_image_dl() {
case ${ANSWER:0:1} in
y|Y )
apt-get install "${INSTALL_APP_LIST[@]}" -y --no-install-recommends

if ! pgrep dockerd; then
echo -e "\\n""$RED""$BOLD""Docker daemon not running! Please check it manually and try again""$NC"
exit 1
Expand Down