Merge branch 'development' into new/whitelist-regex-support

Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER
2019-08-22 14:19:51 +02:00
12 changed files with 151 additions and 34 deletions

View File

@@ -115,7 +115,9 @@ scanDatabaseTable() {
wbMatch=true
# Print table name
echo " ${matchType^} found in ${COL_BOLD}${table^}${COL_NC}"
if [[ -z "${blockpage}" ]]; then
echo " ${matchType^} found in ${COL_BOLD}${table^}${COL_NC}"
fi
# Loop over results and print them
mapfile -t results <<< "${result}"
@@ -160,7 +162,7 @@ scanRegexDatabaseTable() {
# shellcheck disable=SC2001
echo "${str_result}" | sed 's/^/ /'
else
echo "π Regex ${list}"
echo "π .wildcard"
exit 0
fi
fi