From 7d34d0d5042e519898d954fb0dcf3fd486a175a0 Mon Sep 17 00:00:00 2001
From: eXtremeSHOK <admin@extremeshok.com>
Date: Sat, 17 Aug 2019 17:28:12 +0200
Subject: [PATCH 01/45] Remove qotes and .UNOFFICIAL from the whitelist input
 string

---
 clamav-unofficial-sigs.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/clamav-unofficial-sigs.sh b/clamav-unofficial-sigs.sh
index d25cc33f..75bc23a8 100644
--- a/clamav-unofficial-sigs.sh
+++ b/clamav-unofficial-sigs.sh
@@ -654,10 +654,11 @@ EOF
 function decode_third_party_signature_by_signature_name() {
   echo ""
   echo "Input a third-party signature name to decode (e.g: Sanesecurity.Junk.15248) or"
-  echo "a hexadecimal encoded data string and press enter (do not include '.UNOFFICIAL'"
-  echo "in the signature name nor add quote marks to any input string):"
+  echo "a hexadecimal encoded data string and press enter:"
   read -r input
-  input="$(echo "${input}" | tr -d "'" | tr -d '"')"
+	# Remove qotes and .UNOFFICIAL from the whitelist input string
+  input="$(echo "${input}" | tr -d "'" | tr -d '"' | tr -d '`')"
+	input=${input/\.UNOFFICIAL/}
   if echo "${input}" | $grep_bin "\\." > /dev/null ; then
     cd "$clam_dbs" || exit
     sig="$($grep_bin "${input}:" ./*.ndb)"

From d8a10bb56b3356a651b61ab646ca5846c533f0da Mon Sep 17 00:00:00 2001
From: eXtremeSHOK <admin@extremeshok.com>
Date: Sat, 17 Aug 2019 17:30:51 +0200
Subject: [PATCH 02/45] add --fail to curl command fixes #236

---
 clamav-unofficial-sigs.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/clamav-unofficial-sigs.sh b/clamav-unofficial-sigs.sh
index 75bc23a8..4b52ce61 100644
--- a/clamav-unofficial-sigs.sh
+++ b/clamav-unofficial-sigs.sh
@@ -317,7 +317,7 @@ function xshok_file_download() { #outputfile #url #notimestamp
 			fi
     else
       # shellcheck disable=SC2086
-      $curl_bin --compressed $curl_proxy $curl_insecure $curl_output_level --connect-timeout "${downloader_connect_timeout}" --remote-time --location --retry "${downloader_tries}" --max-time "${downloader_max_time}" --time-cond "${1}" --output "${1}" "${2}"
+      $curl_bin --fail --compress $curl_proxy $curl_insecure $curl_output_level --connect-timeout "${downloader_connect_timeout}" --remote-time --location --retry "${downloader_tries}" --max-time "${downloader_max_time}" --time-cond "${1}" --output "${1}" "${2}"
       result=$?
     fi
 		cd "$this_dir" || exit
@@ -1201,7 +1201,7 @@ function check_new_version() {
     latest_version="$($wget_bin $wget_compression $wget_proxy_https $wget_proxy_http $wget_insecure $wget_output_level --connect-timeout="${downloader_connect_timeout}" --random-wait --tries="${downloader_tries}" --timeout="${downloader_max_time}" https://raw.githubusercontent.com/extremeshok/clamav-unofficial-sigs/master/clamav-unofficial-sigs.sh -O - 2> /dev/null | $grep_bin "^script_version=" | head -n1 | cut -d '"' -f 2)"
 	else
     # shellcheck disable=SC2086
-    latest_version="$($curl_bin --compress $curl_proxy $curl_insecure $curl_output_level --connect-timeout "${downloader_connect_timeout}" --remote-time --location --retry "${downloader_tries}" --max-time "${downloader_max_time}" https://raw.githubusercontent.com/extremeshok/clamav-unofficial-sigs/master/clamav-unofficial-sigs.sh 2> /dev/null | $grep_bin "^script_version=" | head -n1 | cut -d '"' -f 2)"
+    latest_version="$($curl_bin --fail --compress $curl_proxy $curl_insecure $curl_output_level --connect-timeout "${downloader_connect_timeout}" --remote-time --location --retry "${downloader_tries}" --max-time "${downloader_max_time}" https://raw.githubusercontent.com/extremeshok/clamav-unofficial-sigs/master/clamav-unofficial-sigs.sh 2> /dev/null | $grep_bin "^script_version=" | head -n1 | cut -d '"' -f 2)"
   fi
   if [ "$latest_version" ] ; then
     if [ "$latest_version" != "$script_version" ] ; then
@@ -1217,7 +1217,7 @@ function check_new_config_version() {
     latest_config_version="$($wget_bin $wget_compression $wget_proxy_https $wget_proxy_http $wget_insecure $wget_output_level --connect-timeout="${downloader_connect_timeout}" --random-wait --tries="${downloader_tries}" --timeout="${downloader_max_time}" https://raw.githubusercontent.com/extremeshok/clamav-unofficial-sigs/master/config/master.conf -O - 2> /dev/null | $grep_bin "^config_version=" | head -n1 | cut -d '"' -f 2)"
   else
     # shellcheck disable=SC2086
-    latest_config_version="$($curl_bin --compress $curl_proxy $curl_insecure $curl_output_level --connect-timeout "${downloader_connect_timeout}" --remote-time --location --retry "${downloader_tries}" --max-time "${downloader_max_time}" https://raw.githubusercontent.com/extremeshok/clamav-unofficial-sigs/master/config/master.conf 2> /dev/null | $grep_bin "^config_version=" | head -n1 | cut -d '"' -f 2)"
+    latest_config_version="$($curl_bin --fail --compress $curl_proxy $curl_insecure $curl_output_level --connect-timeout "${downloader_connect_timeout}" --remote-time --location --retry "${downloader_tries}" --max-time "${downloader_max_time}" https://raw.githubusercontent.com/extremeshok/clamav-unofficial-sigs/master/config/master.conf 2> /dev/null | $grep_bin "^config_version=" | head -n1 | cut -d '"' -f 2)"
   fi
   if [ "$latest_config_version" ] ; then
     if [ "$latest_config_version" != "$config_version" ] ; then

From a260a702705bbacdbc49e29cb0a72e0604834857 Mon Sep 17 00:00:00 2001
From: eXtremeSHOK <admin@extremeshok.com>
Date: Sat, 17 Aug 2019 17:37:03 +0200
Subject: [PATCH 03/45] Remove qotes and .UNOFFICIAL from the string

---
 clamav-unofficial-sigs.sh | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/clamav-unofficial-sigs.sh b/clamav-unofficial-sigs.sh
index 4b52ce61..ceefc350 100644
--- a/clamav-unofficial-sigs.sh
+++ b/clamav-unofficial-sigs.sh
@@ -1017,13 +1017,15 @@ function output_signatures_triggered_during_ham_directory_scan() {
 function add_signature_whitelist_entry() {
   echo ""
   echo "Input a third-party signature name that you wish to whitelist due to false-positives"
-  echo "and press enter (do not include '.UNOFFICIAL' in the signature name nor add quote"
-  echo "marks to the input string):"
+  echo "and press enter"
 
   read -r input
   if [ -n "$input" ] ; then
     cd "$clam_dbs" || exit
-    input="$(echo "${input}" | tr -d "'" | tr -d '"')"
+		# Remove qotes and .UNOFFICIAL from the string
+		input="$(echo "${input}" | tr -d "'" | tr -d '"' | tr -d '`"')"
+		input=${input/\.UNOFFICIAL/}
+
     sig_full="$($grep_bin -H "$input" ./*.*db)"
     sig_name="$(echo "$sig_full" | cut -d ":" -f 2 | cut -d "=" -f 1)"
     if [ -n "$sig_name" ] ; then
@@ -1201,7 +1203,7 @@ function check_new_version() {
     latest_version="$($wget_bin $wget_compression $wget_proxy_https $wget_proxy_http $wget_insecure $wget_output_level --connect-timeout="${downloader_connect_timeout}" --random-wait --tries="${downloader_tries}" --timeout="${downloader_max_time}" https://raw.githubusercontent.com/extremeshok/clamav-unofficial-sigs/master/clamav-unofficial-sigs.sh -O - 2> /dev/null | $grep_bin "^script_version=" | head -n1 | cut -d '"' -f 2)"
 	else
     # shellcheck disable=SC2086
-    latest_version="$($curl_bin --fail --compress $curl_proxy $curl_insecure $curl_output_level --connect-timeout "${downloader_connect_timeout}" --remote-time --location --retry "${downloader_tries}" --max-time "${downloader_max_time}" https://raw.githubusercontent.com/extremeshok/clamav-unofficial-sigs/master/clamav-unofficial-sigs.sh 2> /dev/null | $grep_bin "^script_version=" | head -n1 | cut -d '"' -f 2)"
+    latest_version="$($curl_bin --compress $curl_proxy $curl_insecure $curl_output_level --connect-timeout "${downloader_connect_timeout}" --remote-time --location --retry "${downloader_tries}" --max-time "${downloader_max_time}" https://raw.githubusercontent.com/extremeshok/clamav-unofficial-sigs/master/clamav-unofficial-sigs.sh 2> /dev/null | $grep_bin "^script_version=" | head -n1 | cut -d '"' -f 2)"
   fi
   if [ "$latest_version" ] ; then
     if [ "$latest_version" != "$script_version" ] ; then
@@ -1217,7 +1219,7 @@ function check_new_config_version() {
     latest_config_version="$($wget_bin $wget_compression $wget_proxy_https $wget_proxy_http $wget_insecure $wget_output_level --connect-timeout="${downloader_connect_timeout}" --random-wait --tries="${downloader_tries}" --timeout="${downloader_max_time}" https://raw.githubusercontent.com/extremeshok/clamav-unofficial-sigs/master/config/master.conf -O - 2> /dev/null | $grep_bin "^config_version=" | head -n1 | cut -d '"' -f 2)"
   else
     # shellcheck disable=SC2086
-    latest_config_version="$($curl_bin --fail --compress $curl_proxy $curl_insecure $curl_output_level --connect-timeout "${downloader_connect_timeout}" --remote-time --location --retry "${downloader_tries}" --max-time "${downloader_max_time}" https://raw.githubusercontent.com/extremeshok/clamav-unofficial-sigs/master/config/master.conf 2> /dev/null | $grep_bin "^config_version=" | head -n1 | cut -d '"' -f 2)"
+    latest_config_version="$($curl_bin --compress $curl_proxy $curl_insecure $curl_output_level --connect-timeout "${downloader_connect_timeout}" --remote-time --location --retry "${downloader_tries}" --max-time "${downloader_max_time}" https://raw.githubusercontent.com/extremeshok/clamav-unofficial-sigs/master/config/master.conf 2> /dev/null | $grep_bin "^config_version=" | head -n1 | cut -d '"' -f 2)"
   fi
   if [ "$latest_config_version" ] ; then
     if [ "$latest_config_version" != "$config_version" ] ; then

From d6e3ba186a380eae963773977d62c345c45d2ef7 Mon Sep 17 00:00:00 2001
From: eXtremeSHOK <admin@extremeshok.com>
Date: Sat, 17 Aug 2019 17:38:08 +0200
Subject: [PATCH 04/45] spelling

---
 clamav-unofficial-sigs.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/clamav-unofficial-sigs.sh b/clamav-unofficial-sigs.sh
index ceefc350..24c5d841 100644
--- a/clamav-unofficial-sigs.sh
+++ b/clamav-unofficial-sigs.sh
@@ -656,7 +656,7 @@ function decode_third_party_signature_by_signature_name() {
   echo "Input a third-party signature name to decode (e.g: Sanesecurity.Junk.15248) or"
   echo "a hexadecimal encoded data string and press enter:"
   read -r input
-	# Remove qotes and .UNOFFICIAL from the whitelist input string
+	# Remove quotes and .UNOFFICIAL from the whitelist input string
   input="$(echo "${input}" | tr -d "'" | tr -d '"' | tr -d '`')"
 	input=${input/\.UNOFFICIAL/}
   if echo "${input}" | $grep_bin "\\." > /dev/null ; then
@@ -1022,7 +1022,7 @@ function add_signature_whitelist_entry() {
   read -r input
   if [ -n "$input" ] ; then
     cd "$clam_dbs" || exit
-		# Remove qotes and .UNOFFICIAL from the string
+		# Remove quotes and .UNOFFICIAL from the string
 		input="$(echo "${input}" | tr -d "'" | tr -d '"' | tr -d '`"')"
 		input=${input/\.UNOFFICIAL/}
 

From edc0d79a49357e5d77e2cb26f91bac580a927e35 Mon Sep 17 00:00:00 2001
From: eXtremeSHOK <admin@extremeshok.com>
Date: Sat, 17 Aug 2019 23:14:54 +0200
Subject: [PATCH 05/45] detect if running under cron and silence, always show
 errors and alerts

---
 clamav-unofficial-sigs.sh | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/clamav-unofficial-sigs.sh b/clamav-unofficial-sigs.sh
index 24c5d841..fa126ddb 100644
--- a/clamav-unofficial-sigs.sh
+++ b/clamav-unofficial-sigs.sh
@@ -211,10 +211,20 @@ function xshok_user_group_exists() { # username groupname
 # ========
 # pretty_echo_and_log "" "/\" "7"
 # /\/\/\/\/\/\
-  # type: e = error, w= warning ""
+# type: e = error, w= warning, a = alert
 function xshok_pretty_echo_and_log() { # "string" "repeating" "count" "type"
-  # Handle comments
-  if [ "$comment_silence" == "no" ] ; then
+	#detect if running under cron and silence
+	if [ ! -t 1 ] ; then
+		comment_silence="yes"
+	fi
+	# always show errors and alerts
+	if [ -n "$4" ] ; then
+		if [ "$4" == "e" ] || [ "$4" == "a" ] ; then
+			comment_silence="no"
+		fi
+	fi
+	# Handle comments is not silenced or type
+  if [ "$comment_silence" != "yes" ] ; then
     if [ "${#@}" -eq 1 ] ; then
       echo "${1}"
     else
@@ -234,7 +244,6 @@ function xshok_pretty_echo_and_log() { # "string" "repeating" "count" "type"
       fi
     fi
   fi
-
   # Handle logging
   if [ "$enable_log" == "yes" ] ; then
     if [ ! -z "$log_pipe_cmd" ] ; then

From aa1f4c84474bd781656d057594d3113a297df186 Mon Sep 17 00:00:00 2001
From: eXtremeSHOK <admin@extremeshok.com>
Date: Sat, 17 Aug 2019 23:19:46 +0200
Subject: [PATCH 06/45] Fixes #234

---
 clamav-unofficial-sigs.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/clamav-unofficial-sigs.sh b/clamav-unofficial-sigs.sh
index fa126ddb..efc18249 100644
--- a/clamav-unofficial-sigs.sh
+++ b/clamav-unofficial-sigs.sh
@@ -214,8 +214,10 @@ function xshok_user_group_exists() { # username groupname
 # type: e = error, w= warning, a = alert
 function xshok_pretty_echo_and_log() { # "string" "repeating" "count" "type"
 	#detect if running under cron and silence
-	if [ ! -t 1 ] ; then
-		comment_silence="yes"
+	if [ "$comment_silence" != "yes" ] ; then
+		if [ ! -t 1 ] ; then
+			comment_silence="yes"
+		fi
 	fi
 	# always show errors and alerts
 	if [ -n "$4" ] ; then

From 300236237b2b362bfdb9792128d71feaecaa9924 Mon Sep 17 00:00:00 2001
From: eXtremeSHOK <admin@extremeshok.com>
Date: Sat, 17 Aug 2019 23:48:06 +0200
Subject: [PATCH 07/45] logic for LOWMEDIUMONLY | MEDIUMHIGHONLY | HIGHONLY
 databases fixes #233

---
 clamav-unofficial-sigs.sh | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/clamav-unofficial-sigs.sh b/clamav-unofficial-sigs.sh
index efc18249..da0b5220 100644
--- a/clamav-unofficial-sigs.sh
+++ b/clamav-unofficial-sigs.sh
@@ -390,7 +390,7 @@ function clamav_files() {
 
 # Manage the databases and allow multi-dimensions as well as global overrides
 # Since the datbases are basically a multi-dimentional associative arrays in bash
-# ratings: LOW| MEDIUM| HIGH| REQUIRED| LOWONLY| MEDIUMONLY| LOWMEDIUMONLY | MEDIUMHIGHONLY | HIGHONLY| DISABLED
+# ratings: LOW | MEDIUM | HIGH | REQUIRED | LOWONLY | MEDIUMONLY | LOWMEDIUMONLY | MEDIUMHIGHONLY | HIGHONLY | DISABLED
 function xshok_database() { # rating database_array
   # Assign
   current_rating="${1}"
@@ -421,18 +421,38 @@ function xshok_database() { # rating database_array
               elif [ "$db_name_rating" == "REQUIRED" ] ; then
                 new_dbs+=( "$db_name" )
               elif [ "$current_rating" == "LOW" ] ; then
-                if [ "$db_name_rating" == "LOWONLY" ] || [ "$db_name_rating" == "LOW" ] || [ "$db_name_rating" == "LOWMEDIUM" ] ; then
+                if [ "$db_name_rating" == "LOWONLY" ] || [ "$db_name_rating" == "LOW" ] || [ "$db_name_rating" == "LOWMEDIUMONLY" ] ; then
                   new_dbs+=( "$db_name" )
                 fi
               elif [ "$current_rating" == "MEDIUM" ] ; then
-                if [ "$db_name_rating" == "MEDIUMONLY" ] || [ "$db_name_rating" == "MEDIUM" ] || [ "$db_name_rating" == "LOW" ] || [ "$db_name_rating" == "LOWMEDIUM" ] ; then
+                if [ "$db_name_rating" == "MEDIUMONLY" ] || [ "$db_name_rating" == "MEDIUM" ] || [ "$db_name_rating" == "LOW" ] || [ "$db_name_rating" == "LOWMEDIUMONLY" ]  || [ "$db_name_rating" == "MEDIUMHIGHONLY" ] ; then
                   new_dbs+=( "$db_name" )
                 fi
               elif [ "$current_rating" == "HIGH" ] ; then
-                if [ "$db_name_rating" == "HIGH" ] || [ "$db_name_rating" == "MEDIUM" ] || [ "$db_name_rating" == "LOW" ] ; then
+                if [ "$db_name_rating" == "HIGHONLY" ] || [ "$db_name_rating" == "HIGH" ] || [ "$db_name_rating" == "MEDIUM" ] || [ "$db_name_rating" == "LOW" ] || [ "$db_name_rating" == "MEDIUMHIGHONLY" ] ; then
                   new_dbs+=( "$db_name" )
                 fi
-              fi
+							elif [ "$current_rating" == "LOWONLY" ] ; then
+								if [ "$db_name_rating" == "LOWONLY" ] || [ "$db_name_rating" == "LOW" ] ; then
+									new_dbs+=( "$db_name" )
+								fi
+							elif [ "$current_rating" == "MEDIUMONLY" ] ; then
+								if [ "$db_name_rating" == "MEDIUMONLY" ] || [ "$db_name_rating" == "MEDIUM" ] ; then
+									new_dbs+=( "$db_name" )
+								fi
+							elif [ "$current_rating" == "LOWMEDIUMONLY" ] ; then
+								if [ "$db_name_rating" == "LOWMEDIUMONLY" ] || [ "$db_name_rating" == "LOW" ]  || [ "$db_name_rating" == "MEDIUM" ]; then
+									new_dbs+=( "$db_name" )
+								fi
+							elif [ "$current_rating" == "MEDIUMHIGHONLY" ] ; then
+								if [ "$db_name_rating" == "MEDIUMHIGHONLY" ] || [ "$db_name_rating" == "MEDIUM" ] || [ "$db_name_rating" == "HIGH" ]; then
+									new_dbs+=( "$db_name" )
+								fi
+							elif [ "$current_rating" == "HIGHONLY" ] ; then
+								if [ "$db_name_rating" == "HIGHONLY" ] || || [ "$db_name_rating" == "HIGH" ]; then
+									new_dbs+=( "$db_name" )
+								fi
+							fi
             fi
           fi
         fi

From 46d0359263deb91af50cbcf30747f3ac58117da2 Mon Sep 17 00:00:00 2001
From: eXtremeSHOK <admin@extremeshok.com>
Date: Sun, 18 Aug 2019 00:25:30 +0200
Subject: [PATCH 08/45] find the first suitable os.conf or os.*.conf file fixes
 #232

---
 clamav-unofficial-sigs.sh | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/clamav-unofficial-sigs.sh b/clamav-unofficial-sigs.sh
index da0b5220..27ad7586 100644
--- a/clamav-unofficial-sigs.sh
+++ b/clamav-unofficial-sigs.sh
@@ -1502,7 +1502,20 @@ if [ "$custom_config" != "no" ] ; then
   if [ -d "$custom_config" ] ; then
     # Assign the custom config dir and remove trailing / (removes / and //)
     shopt -s extglob; config_dir="${custom_config%%+(/)}"
-    config_files=( "${config_dir}/master.conf" "${config_dir}/os.conf" "${config_dir}/user.conf" )
+		declare -A config_files
+		if [ -r "${config_dir}/master.conf" ] ; then
+			config_files+=( "${config_dir}/master.conf" )
+		fi
+		#find the first suitable os.conf or os.*.conf file
+		config_file="$(ls ${config_dir} | $grep_bin "os.*.conf" | head -n1)"
+		if [ -r "${config_dir}/${config_file}" ] && [ "$config_file" != "" ]; then
+			config_files+=( "${config_dir}/${config_file}" )
+		else
+			xshok_pretty_echo_and_log "WARNING: ${config_dir}/os.conf not found" "*"
+		fi
+		if [ -r "${config_dir}/user.conf" ] ; then
+			config_files+=( "${config_dir}/user.conf" )
+		fi
   else
     config_files=( "$custom_config" )
   fi
@@ -1514,8 +1527,6 @@ for config_file in "${config_files[@]}" ; do
     # Config stripping
     xshok_pretty_echo_and_log "Loading config: ${config_file}" "="
 
-
-
     if [ "$(uname -s)" == "SunOS" ] ; then
       # Solaris FIXES only, i had issues with running with a single command..
       clean_config="$(command sed -e '/^#.*/d' "$config_file")" # Comment line

From c423a0df83773a9e21ef3b6b287caba4bdc3f18f Mon Sep 17 00:00:00 2001
From: eXtremeSHOK <admin@extremeshok.com>
Date: Sun, 18 Aug 2019 00:29:18 +0200
Subject: [PATCH 09/45] fix double ||

---
 clamav-unofficial-sigs.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/clamav-unofficial-sigs.sh b/clamav-unofficial-sigs.sh
index 27ad7586..f9a48fa3 100644
--- a/clamav-unofficial-sigs.sh
+++ b/clamav-unofficial-sigs.sh
@@ -441,15 +441,15 @@ function xshok_database() { # rating database_array
 									new_dbs+=( "$db_name" )
 								fi
 							elif [ "$current_rating" == "LOWMEDIUMONLY" ] ; then
-								if [ "$db_name_rating" == "LOWMEDIUMONLY" ] || [ "$db_name_rating" == "LOW" ]  || [ "$db_name_rating" == "MEDIUM" ]; then
+								if [ "$db_name_rating" == "LOWMEDIUMONLY" ] || [ "$db_name_rating" == "LOW" ]  || [ "$db_name_rating" == "MEDIUM" ] ; then
 									new_dbs+=( "$db_name" )
 								fi
 							elif [ "$current_rating" == "MEDIUMHIGHONLY" ] ; then
-								if [ "$db_name_rating" == "MEDIUMHIGHONLY" ] || [ "$db_name_rating" == "MEDIUM" ] || [ "$db_name_rating" == "HIGH" ]; then
+								if [ "$db_name_rating" == "MEDIUMHIGHONLY" ] || [ "$db_name_rating" == "MEDIUM" ] || [ "$db_name_rating" == "HIGH" ] ; then
 									new_dbs+=( "$db_name" )
 								fi
 							elif [ "$current_rating" == "HIGHONLY" ] ; then
-								if [ "$db_name_rating" == "HIGHONLY" ] || || [ "$db_name_rating" == "HIGH" ]; then
+								if [ "$db_name_rating" == "HIGHONLY" ] || [ "$db_name_rating" == "HIGH" ] ; then
 									new_dbs+=( "$db_name" )
 								fi
 							fi

From 01367d176a2b1438fc18bd41579c171ff5a2538b Mon Sep 17 00:00:00 2001
From: eXtremeSHOK <admin@extremeshok.com>
Date: Sun, 18 Aug 2019 01:02:34 +0200
Subject: [PATCH 10/45] fix the array declaration

---
 clamav-unofficial-sigs.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/clamav-unofficial-sigs.sh b/clamav-unofficial-sigs.sh
index f9a48fa3..8e7a88f3 100644
--- a/clamav-unofficial-sigs.sh
+++ b/clamav-unofficial-sigs.sh
@@ -563,7 +563,7 @@ function install_logrotate() {
     touch "${logrotate_dir}/${logrotate_filename}" 2>/dev/null
   fi
   if [ ! -w "${logrotate_dir}/${logrotate_filename}" ] ; then
-    echo "ERROR: logrotate install aborted, as file not writable: ${logrotate_dir}/${logrotate_filename}"
+    xshok_pretty_echo_and_log "ERROR: logrotate install aborted, as file not writable: ${logrotate_dir}/${logrotate_filename}" "="
   else
     # Our template..
     cat << EOF > "${logrotate_dir}/${logrotate_filename}"
@@ -638,7 +638,7 @@ function install_cron() {
     touch "${cron_dir}/${cron_filename}" 2>/dev/null
   fi
   if [ ! -w "${cron_dir}/${cron_filename}" ] ; then
-    echo "ERROR: cron install aborted, as file not writable: ${cron_dir}/${cron_filename}"
+    xshok_pretty_echo_and_log "ERROR: cron install aborted, as file not writable: ${cron_dir}/${cron_filename}" "="
   else
     # Our template..
     cat << EOF > "${cron_dir}/${cron_filename}"
@@ -1502,7 +1502,7 @@ if [ "$custom_config" != "no" ] ; then
   if [ -d "$custom_config" ] ; then
     # Assign the custom config dir and remove trailing / (removes / and //)
     shopt -s extglob; config_dir="${custom_config%%+(/)}"
-		declare -A config_files
+		config_files=()
 		if [ -r "${config_dir}/master.conf" ] ; then
 			config_files+=( "${config_dir}/master.conf" )
 		fi

From db5a88729c46833134afe8c8753e7836239a79de Mon Sep 17 00:00:00 2001
From: eXtremeSHOK <admin@extremeshok.com>
Date: Sun, 18 Aug 2019 01:08:56 +0200
Subject: [PATCH 11/45] keep shellcheck happy, replace ls | grep with find

---
 clamav-unofficial-sigs.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/clamav-unofficial-sigs.sh b/clamav-unofficial-sigs.sh
index 8e7a88f3..836c7547 100644
--- a/clamav-unofficial-sigs.sh
+++ b/clamav-unofficial-sigs.sh
@@ -1506,8 +1506,8 @@ if [ "$custom_config" != "no" ] ; then
 		if [ -r "${config_dir}/master.conf" ] ; then
 			config_files+=( "${config_dir}/master.conf" )
 		fi
-		#find the first suitable os.conf or os.*.conf file
-		config_file="$(ls ${config_dir} | $grep_bin "os.*.conf" | head -n1)"
+		#find the a suitable os.conf or os.*.conf file
+		config_file="$(find "$config_dir" -type f -iname "os.conf" -o -iname "os.*.conf" | tail -n1)"
 		if [ -r "${config_dir}/${config_file}" ] && [ "$config_file" != "" ]; then
 			config_files+=( "${config_dir}/${config_file}" )
 		else

From a5e88f394b955c1d55da1aa12e76ef6a9aa394c6 Mon Sep 17 00:00:00 2001
From: eXtremeSHOK <admin@extremeshok.com>
Date: Sun, 18 Aug 2019 01:16:29 +0200
Subject: [PATCH 12/45] where possible replace echo with
 xshok_pretty_echo_and_log

---
 clamav-unofficial-sigs.sh | 248 +++++++++++++++++++-------------------
 1 file changed, 124 insertions(+), 124 deletions(-)

diff --git a/clamav-unofficial-sigs.sh b/clamav-unofficial-sigs.sh
index 836c7547..5145d4a7 100644
--- a/clamav-unofficial-sigs.sh
+++ b/clamav-unofficial-sigs.sh
@@ -347,16 +347,16 @@ function xshok_auto_update() { # version
   result=$?
 
   if [ "$result" -ne 0 ] ; then
-    echo "Failed: Error while trying to get new version!"
-    echo "File requested: ${UPDATE_BASE}/${SELF}"
+    xshok_pretty_echo_and_log "Failed: Error while trying to get new version!"
+    xshok_pretty_echo_and_log "File requested: ${UPDATE_BASE}/${SELF}"
     exit 1
   fi
-  echo "Done."
+  xshok_pretty_echo_and_log "Done."
 
   # Copy over modes from old version
   OCTAL_MODE="$(stat -c "%a" "$SELF")"
   if ! chmod "$OCTAL_MODE" "${0}.tmp" ; then
-    echo "Failed: Error while trying to set mode on ${0}.tmp."
+    xshok_pretty_echo_and_log "Failed: Error while trying to set mode on ${0}.tmp."
     exit 1
   fi
 
@@ -365,10 +365,10 @@ function xshok_auto_update() { # version
 #!/usr/bin/env bash
 # Overwrite old file with new
 if mv "${0}.tmp" "${0}" ; then
-  echo "Done. Update complete."
+  xshok_pretty_echo_and_log "Done. Update complete."
   rm \$0
 else
-  echo "Failed! The update was not completed."
+  xshok_pretty_echo_and_log "Failed! The update was not completed."
 fi
 EOF
 
@@ -471,12 +471,12 @@ function xshok_database() { # rating database_array
 function install_man() {
 
   if [ -n "$pkg_mgr" ] || [ -n "$pkg_rm" ] ; then
-    echo "This script (clamav-unofficial-sigs) was installed on the system via ${pkg_mgr}"
+    xshok_pretty_echo_and_log "This script (clamav-unofficial-sigs) was installed on the system via ${pkg_mgr}"
     exit 1
   fi
 
-  echo ""
-  echo "Generating man file for install...."
+  xshok_pretty_echo_and_log ""
+  xshok_pretty_echo_and_log "Generating man file for install...."
 
   # Use defined varibles or attempt to use default varibles
 
@@ -485,7 +485,7 @@ function install_man() {
     touch "${man_dir}/${man_filename}" 2>/dev/null
   fi
   if [ ! -w "${man_dir}/${man_filename}" ] ; then
-    echo "ERROR: man install aborted, as file not writable: ${man_dir}/${man_filename}"
+    xshok_pretty_echo_and_log "ERROR: man install aborted, as file not writable: ${man_dir}/${man_filename}"
   else
 
     BOLD="\\fB"
@@ -530,7 +530,7 @@ Originially based on Script provide by Bill Landry
 EOF
 
   fi
-  echo "Completed: man installed, as file: ${man_dir}/${man_filename}"
+  xshok_pretty_echo_and_log "Completed: man installed, as file: ${man_dir}/${man_filename}"
 }
 
 
@@ -538,12 +538,12 @@ EOF
 function install_logrotate() {
 
   if [ -n "$pkg_mgr" ] || [ -n "$pkg_rm" ] ; then
-    echo "This script (clamav-unofficial-sigs) was installed on the system via ${pkg_mgr}"
+    xshok_pretty_echo_and_log "This script (clamav-unofficial-sigs) was installed on the system via ${pkg_mgr}"
     exit 1
   fi
 
-  echo ""
-  echo "Generating logrotate file for install...."
+  xshok_pretty_echo_and_log ""
+  xshok_pretty_echo_and_log "Generating logrotate file for install...."
 
   # Use defined varibles or attempt to use default varibles
 
@@ -603,19 +603,19 @@ $logrotate_log_file_full_path {
 EOF
 
   fi
-  echo "Completed: logrotate installed, as file: ${logrotate_dir}/${logrotate_filename}"
+  xshok_pretty_echo_and_log "Completed: logrotate installed, as file: ${logrotate_dir}/${logrotate_filename}"
 }
 
 # Generate a cron config and install it
 function install_cron() {
 
   if [ -n "$pkg_mgr" ] || [ -n "$pkg_rm" ] ; then
-    echo "This script (clamav-unofficial-sigs) was installed on the system via {$pkg_mgr}"
+    xshok_pretty_echo_and_log "This script (clamav-unofficial-sigs) was installed on the system via {$pkg_mgr}"
     exit 1
   fi
 
-  echo ""
-  echo "Generating cron file for install...."
+  xshok_pretty_echo_and_log ""
+  xshok_pretty_echo_and_log "Generating cron file for install...."
 
   # Use defined varibles or attempt to use default varibles
   if [ -z "$cron_minute" ] ; then
@@ -677,15 +677,15 @@ $cron_minute * * * * ${cron_sudo} ${cron_user} [ -x ${cron_script_full_path} ] &
 EOF
 
   fi
-  echo "Completed: cron installed, as file: ${cron_dir}/${cron_filename}"
+  xshok_pretty_echo_and_log "Completed: cron installed, as file: ${cron_dir}/${cron_filename}"
 }
 
 
 # Decode a third-party signature either by signature name
 function decode_third_party_signature_by_signature_name() {
-  echo ""
-  echo "Input a third-party signature name to decode (e.g: Sanesecurity.Junk.15248) or"
-  echo "a hexadecimal encoded data string and press enter:"
+  xshok_pretty_echo_and_log ""
+  xshok_pretty_echo_and_log "Input a third-party signature name to decode (e.g: Sanesecurity.Junk.15248) or"
+  xshok_pretty_echo_and_log "a hexadecimal encoded data string and press enter:"
   read -r input
 	# Remove quotes and .UNOFFICIAL from the whitelist input string
   input="$(echo "${input}" | tr -d "'" | tr -d '"' | tr -d '`')"
@@ -695,51 +695,51 @@ function decode_third_party_signature_by_signature_name() {
     sig="$($grep_bin "${input}:" ./*.ndb)"
     if [ -n "$sig" ] ; then
       db_file="${sig%:*}"
-      echo "${input} found in: ${db_file}"
-      echo "${input} signature decodes to:"
-      echo "$sig" | cut -d ":" -f 5 | perl -pe 's/([a-fA-F0-9]{2})|(\{[^}]*\}|\([^)]*\))/defined $2 ? $2 : chr(hex $1)/eg'
+      xshok_pretty_echo_and_log "${input} found in: ${db_file}"
+      xshok_pretty_echo_and_log "${input} signature decodes to:"
+      xshok_pretty_echo_and_log "$sig" | cut -d ":" -f 5 | perl -pe 's/([a-fA-F0-9]{2})|(\{[^}]*\}|\([^)]*\))/defined $2 ? $2 : chr(hex $1)/eg'
     else
-      echo "Signature ${input} could not be found."
-      echo "This script will only decode ClamAV 'UNOFFICIAL' third-Party,"
-      echo "non-image based, signatures as found in the *.ndb databases."
+      xshok_pretty_echo_and_log "Signature ${input} could not be found."
+      xshok_pretty_echo_and_log "This script will only decode ClamAV 'UNOFFICIAL' third-Party,"
+      xshok_pretty_echo_and_log "non-image based, signatures as found in the *.ndb databases."
     fi
   else
-    echo "Here is the decoded hexadecimal input string:"
+    xshok_pretty_echo_and_log "Here is the decoded hexadecimal input string:"
     echo "${input}" | perl -pe 's/([a-fA-F0-9]{2})|(\{[^}]*\}|\([^)]*\))/defined $2 ? $2 : chr(hex $1)/eg'
   fi
 }
 
 # Hexadecimal encode an entire input string
 function hexadecimal_encode_entire_input_string() {
-  echo ""
-  echo "Input the data string that you want to hexadecimal encode and then press enter.  Do not include"
-  echo "any quotes around the string unless you want them included in the hexadecimal encoded output:"
+  xshok_pretty_echo_and_log ""
+  xshok_pretty_echo_and_log "Input the data string that you want to hexadecimal encode and then press enter.  Do not include"
+  xshok_pretty_echo_and_log "any quotes around the string unless you want them included in the hexadecimal encoded output:"
   read -r input
-  echo "Here is the hexadecimal encoded input string:"
+  xshok_pretty_echo_and_log "Here is the hexadecimal encoded input string:"
   echo "${input}" | perl -pe 's/(.)/sprintf("%02lx", ord $1)/eg'
 }
 
 # Hexadecimal encode a formatted input string
 function hexadecimal_encode_formatted_input_string() {
-  echo ""
-  echo "Input a formated data string containing spacing fields '{}, (), *' that you want to hexadecimal"
-  echo "encode, without encoding the spacing fields, and then press enter.  Do not include any quotes"
-  echo "around the string unless you want them included in the hexadecimal encoded output:"
+  xshok_pretty_echo_and_log ""
+  xshok_pretty_echo_and_log "Input a formated data string containing spacing fields '{}, (), *' that you want to hexadecimal"
+  xshok_pretty_echo_and_log "encode, without encoding the spacing fields, and then press enter.  Do not include any quotes"
+  xshok_pretty_echo_and_log "around the string unless you want them included in the hexadecimal encoded output:"
   read -r input
-  echo "Here is the hexadecimal encoded input string:"
+  xshok_pretty_echo_and_log "Here is the hexadecimal encoded input string:"
   echo "${input}" | perl -pe 's/(\{[^}]*\}|\([^)]*\)|\*)|(.)/defined $1 ? $1 : sprintf("%02lx", ord $2)/eg'
 }
 
 # GPG verify a specific Sanesecurity database file
 function gpg_verify_specific_sanesecurity_database_file() { # databasefile
-  echo ""
+  xshok_pretty_echo_and_log ""
   if [ "$enable_gpg" == "no" ] ; then
     xshok_pretty_echo_and_log "Notice: GnuPG / signature verification disabled" "-"
   else
     if [ "${1}" ] ; then
       db_file="$(echo "${1}" | awk -F "/" '{print $NF}')"
       if [ -r "${work_dir_sanesecurity}/${db_file}" ] ; then
-        echo "GPG signature testing database file: ${work_dir_sanesecurity}/${db_file}"
+        xshok_pretty_echo_and_log "GPG signature testing database file: ${work_dir_sanesecurity}/${db_file}"
         if [ -r "${work_dir_sanesecurity}/${db_file}.sig" ] ; then
           if ! "$gpg_bin" -q --trust-model always --no-default-keyring --homedir "${work_dir_gpg}" --keyring "${work_dir_gpg}/ss-keyring.gpg" --verify "${work_dir_sanesecurity}/${db_file}.sig" "${work_dir_sanesecurity}/${db_file}" ; then
             if "$gpg_bin" -q --always-trust --no-default-keyring --homedir "${work_dir_gpg}" --keyring "${work_dir_gpg}/ss-keyring.gpg" --verify "${work_dir_sanesecurity}/${db_file}.sig" "${work_dir_sanesecurity}/${db_file}" ; then
@@ -751,11 +751,11 @@ function gpg_verify_specific_sanesecurity_database_file() { # databasefile
             exit 0
           fi
         else
-          echo "Signature ${db_file}.sig cannot be found."
+          xshok_pretty_echo_and_log "Signature ${db_file}.sig cannot be found."
         fi
       else
-        echo "File ${db_file} cannot be found or is not a Sanesecurity database file."
-        echo "Only the following Sanesecurity and OITC databases can be GPG signature tested:"
+        xshok_pretty_echo_and_log "File ${db_file} cannot be found or is not a Sanesecurity database file."
+        xshok_pretty_echo_and_log "Only the following Sanesecurity and OITC databases can be GPG signature tested:"
         ls --ignore "*.sig" --ignore "*.md5" --ignore "*.ign2" "${work_dir_sanesecurity}"
       fi
     else
@@ -768,51 +768,51 @@ function gpg_verify_specific_sanesecurity_database_file() { # databasefile
 
 # Output system and configuration information
 function output_system_configuration_information() {
-  echo ""
-  echo "*** SCRIPT VERSION ***"
-  echo "${this_script_name} ${script_version} (${script_version_date})"
-  echo "*** SYSTEM INFORMATION ***"
+  xshok_pretty_echo_and_log ""
+  xshok_pretty_echo_and_log "*** SCRIPT VERSION ***"
+  xshok_pretty_echo_and_log "${this_script_name} ${script_version} (${script_version_date})"
+  xshok_pretty_echo_and_log "*** SYSTEM INFORMATION ***"
   $uname_bin -a
-  echo "*** CLAMSCAN LOCATION & VERSION ***"
-  echo "${clamscan_bin}"
+  xshok_pretty_echo_and_log "*** CLAMSCAN LOCATION & VERSION ***"
+  xshok_pretty_echo_and_log "${clamscan_bin}"
   $clamscan_bin --version | head -1
-  echo "*** RSYNC LOCATION & VERSION ***"
-  echo "${rsync_bin}"
+  xshok_pretty_echo_and_log "*** RSYNC LOCATION & VERSION ***"
+  xshok_pretty_echo_and_log "${rsync_bin}"
   $rsync_bin --version | head -1
   if [ -n "$wget_bin" ] ; then
-    echo "*** WGET LOCATION & VERSION ***"
-    echo "${wget_bin}"
+    xshok_pretty_echo_and_log "*** WGET LOCATION & VERSION ***"
+    xshok_pretty_echo_and_log "${wget_bin}"
     $wget_bin --version | head -1
   else
-    echo "*** CURL LOCATION & VERSION ***"
-    echo "${curl_bin}"
+    xshok_pretty_echo_and_log "*** CURL LOCATION & VERSION ***"
+    xshok_pretty_echo_and_log "${curl_bin}"
     $curl_bin --version | head -1
   fi
   if [ "$enable_gpg" == "yes" ] ; then
-    echo "*** GPG LOCATION & VERSION ***"
-    echo "${gpg_bin}"
+    xshok_pretty_echo_and_log "*** GPG LOCATION & VERSION ***"
+    xshok_pretty_echo_and_log "${gpg_bin}"
     $gpg_bin --version | head -1
   fi
-  echo "*** SCRIPT WORKING DIRECTORY INFORMATION ***"
-  echo "${work_dir}"
-  echo "*** CLAMAV DIRECTORY INFORMATION ***"
-  echo "${clam_dbs}"
-  echo "*** SCRIPT CONFIGURATION SETTINGS ***"
+  xshok_pretty_echo_and_log "*** SCRIPT WORKING DIRECTORY INFORMATION ***"
+  xshok_pretty_echo_and_log "${work_dir}"
+  xshok_pretty_echo_and_log "*** CLAMAV DIRECTORY INFORMATION ***"
+  xshok_pretty_echo_and_log "${clam_dbs}"
+  xshok_pretty_echo_and_log "*** SCRIPT CONFIGURATION SETTINGS ***"
   if [ "$custom_config" != "no" ] ; then
     if [ -d "$custom_config" ] ; then
       # Assign the custom config dir and remove trailing / (removes / and //)
-      echo "Custom Configuration Directory: ${custom_config}"
+      xshok_pretty_echo_and_log "Custom Configuration Directory: ${custom_config}"
     else
-      echo "Custom Configuration File: ${custom_config}"
+      xshok_pretty_echo_and_log "Custom Configuration File: ${custom_config}"
     fi
   else
-    echo "Configuration Directory: ${config_dir}"
+    xshok_pretty_echo_and_log "Configuration Directory: ${config_dir}"
   fi
 }
 
 # Make a signature database from an ascii file
 function make_signature_database_from_ascii_file() {
-  echo ""
+  xshok_pretty_echo_and_log ""
   echo "
   The '-m' script flag provides a way to create a ClamAV hexadecimal signature database (*.ndb) file
   from a list of data strings stored in a clear-text ascii file, with one data string entry per line.
@@ -860,8 +860,8 @@ function make_signature_database_from_ascii_file() {
     if [ -r "$source" ] ; then
       source_file="$(basename "$source")"
 
-      echo "What signature prefix would you like to use?  For example: 'Phish.Domains'"
-      echo "will create signatures that looks like: 'Phish.Domains.1:4:*:HexSigHere'"
+      xshok_pretty_echo_and_log "What signature prefix would you like to use?  For example: 'Phish.Domains'"
+      xshok_pretty_echo_and_log "will create signatures that looks like: 'Phish.Domains.1:4:*:HexSigHere'"
 
       echo -n "Enter signature prefix: "
       read -r prefix
@@ -880,19 +880,19 @@ function make_signature_database_from_ascii_file() {
         else
           echo "$line" | perl -pe 's/(.)/sprintf("%02lx", ord $1)/eg' | command sed "s/^/$prefix\\.$line_num:4:\\*:/" >> "$path_file"
         fi
-        echo "Hexadecimal encoding ${source_file} line: ${line_num} of ${total}"
+        xshok_pretty_echo_and_log "Hexadecimal encoding ${source_file} line: ${line_num} of ${total}"
         line_num="$((line_num + 1))"
       done < "$source"
     else
-      echo "Source file not found, exiting..."
+      xshok_pretty_echo_and_log "Source file not found, exiting..."
       exit
     fi
 
 
-    echo "Signature database file created at: ${path_file}"
+    xshok_pretty_echo_and_log "Signature database file created at: ${path_file}"
     if $clamscan_bin --quiet -d "$path_file" "${work_dir_work_configs}/scan-test.txt" 2>/dev/null ; then
 
-      echo "Clamscan reports database integrity tested good."
+      xshok_pretty_echo_and_log "Clamscan reports database integrity tested good."
 
       echo -n "Would you like to move '${db_file}' into '${clam_dbs}' and reload databases?"
       if xshok_prompt_confirm ; then
@@ -905,60 +905,60 @@ function make_signature_database_from_ascii_file() {
             fi
             $clamd_restart_opt
 
-            echo "Signature database '${db_file}' was successfully implemented and ClamD databases reloaded."
+            xshok_pretty_echo_and_log "Signature database '${db_file}' was successfully implemented and ClamD databases reloaded."
           else
 
-            echo "Failed to add/update '${db_file}', ClamD database not reloaded."
+            xshok_pretty_echo_and_log "Failed to add/update '${db_file}', ClamD database not reloaded."
           fi
         else
 
-          echo "Database '${db_file}' has not changed - skipping"
+          xshok_pretty_echo_and_log "Database '${db_file}' has not changed - skipping"
         fi
       else
 
-        echo "No action taken."
+        xshok_pretty_echo_and_log "No action taken."
       fi
     else
 
-      echo "Clamscan reports that '${db_file}' signature database integrity tested bad."
+      xshok_pretty_echo_and_log "Clamscan reports that '${db_file}' signature database integrity tested bad."
     fi
   fi
 }
 
 # Remove the clamav-unofficial-sigs script
 function remove_script() {
-  echo ""
+  xshok_pretty_echo_and_log ""
   if [ -n "$pkg_mgr" ] || [ -n "$pkg_rm" ] ; then
-    echo "This script (clamav-unofficial-sigs) was installed on the system via '${pkg_mgr}'"
-    echo "use '${pkg_rm}' to remove the script and all of its associated files and databases from the system."
+    xshok_pretty_echo_and_log "This script (clamav-unofficial-sigs) was installed on the system via '${pkg_mgr}'"
+    xshok_pretty_echo_and_log "use '${pkg_rm}' to remove the script and all of its associated files and databases from the system."
 
   else
     cron_file_full_path="${cron_dir}/${cron_filename}"
     logrotate_file_full_path="${logrotate_dir}/${logrotate_filename}"
     man_file_full_path="${man_dir}/${man_filename}"
 
-    echo "This will remove the workdir (${work_dir}), logrotate file (${logrotate_file_full_path}), cron file (${cron_file_full_path}), man file (${man_file_full_path})"
-    echo "Are you sure you want to remove the clamav-unofficial-sigs script and all of its associated files, third-party databases, and work directory from the system?"
+    xshok_pretty_echo_and_log "This will remove the workdir (${work_dir}), logrotate file (${logrotate_file_full_path}), cron file (${cron_file_full_path}), man file (${man_file_full_path})"
+    xshok_pretty_echo_and_log "Are you sure you want to remove the clamav-unofficial-sigs script and all of its associated files, third-party databases, and work directory from the system?"
     if xshok_prompt_confirm ; then
-      echo "This can not be undone are you sure ?"
+      xshok_pretty_echo_and_log "This can not be undone are you sure ?"
       if xshok_prompt_confirm ; then
         if [ -r "${work_dir_work_configs}/purge.txt" ] ; then
 
           while read -r file ; do
             xshok_is_file "$file" && rm -f -- "$file"
-            echo "     Removed file: ${file}"
+            xshok_pretty_echo_and_log "     Removed file: ${file}"
           done < "${work_dir_work_configs}/purge.txt"
           if [ -r "$cron_file_full_path" ] ; then
             xshok_is_file "$cron_file_full_path" && rm -f "$cron_file_full_path"
-            echo "     Removed file: ${cron_file_full_path}"
+            xshok_pretty_echo_and_log "     Removed file: ${cron_file_full_path}"
           fi
           if [ -r "$logrotate_file_full_path" ] ; then
             xshok_is_file "$logrotate_file_full_path" && rm -f "$logrotate_file_full_path"
-            echo "     Removed file: ${logrotate_file_full_path}"
+            xshok_pretty_echo_and_log "     Removed file: ${logrotate_file_full_path}"
           fi
           if [ -r "$man_file_full_path" ] ; then
             xshok_is_file "$man_file_full_path" && rm -f "$man_file_full_path"
-            echo "     Removed file: ${man_file_full_path}"
+            xshok_pretty_echo_and_log "     Removed file: ${man_file_full_path}"
           fi
 
           # Rather keep the configs
@@ -966,60 +966,60 @@ function remove_script() {
           #rm -f -- "${0}" && echo "     Removed file: $0"
           xshok_is_subdir "$work_dir" && rm -rf -- "${work_dir:?}" && echo "     Removed script working directories: ${work_dir}"
 
-          echo "  The clamav-unofficial-sigs script and all of its associated files, third-party"
-          echo "  databases, and work directories have been successfully removed from the system."
+          xshok_pretty_echo_and_log "  The clamav-unofficial-sigs script and all of its associated files, third-party"
+          xshok_pretty_echo_and_log "  databases, and work directories have been successfully removed from the system."
 
         else
-          echo "  Cannot locate 'purge.txt' file in ${work_dir_work_configs}."
-          echo "  Files and signature database will need to be removed manually."
+          xshok_pretty_echo_and_log "  Cannot locate 'purge.txt' file in ${work_dir_work_configs}."
+          xshok_pretty_echo_and_log "  Files and signature database will need to be removed manually."
         fi
       else
-        echo "Aborted"
+        xshok_pretty_echo_and_log "Aborted"
       fi
     else
-      echo "Aborted"
+      xshok_pretty_echo_and_log "Aborted"
     fi
   fi
 }
 
 # Clamscan integrity test a specific database file
 function clamscan_integrity_test_specific_database_file() { # databasefile
-  echo ""
+  xshok_pretty_echo_and_log ""
   if [ "${1}" ] ; then
     input="$(echo "${1}" | awk -F "/" '{print $NF}')"
     db_file="$(find "$work_dir" -name "$input")"
     if [ -r "$db_file" ] ; then
-      echo "Clamscan integrity testing: ${db_file}"
+      xshok_pretty_echo_and_log "Clamscan integrity testing: ${db_file}"
       if $clamscan_bin --quiet -d "$db_file" "${work_dir_work_configs}/scan-test.txt" ; then
-        echo "Clamscan reports that '${input}' database integrity tested GOOD"
+        xshok_pretty_echo_and_log "Clamscan reports that '${input}' database integrity tested GOOD"
         exit 0
       else
-        echo "Clamscan reports that '${input}' database integrity tested BAD"
+        xshok_pretty_echo_and_log "Clamscan reports that '${input}' database integrity tested BAD"
         exit 1
       fi
     else
-      echo "File '${input}' cannot be found."
-      echo "Here is a list of third-party databases that can be clamscan integrity tested:"
+      xshok_pretty_echo_and_log "File '${input}' cannot be found."
+      xshok_pretty_echo_and_log "Here is a list of third-party databases that can be clamscan integrity tested:"
 
-      echo "=== Sanesecurity ==="
+      xshok_pretty_echo_and_log "=== Sanesecurity ==="
       ls --ignore "*.sig" --ignore "*.md5" --ignore "*.ign2" "$work_dir_sanesecurity"
 
-      echo "=== SecuriteInfo ==="
+      xshok_pretty_echo_and_log "=== SecuriteInfo ==="
       ls --ignore "*.sig" --ignore "*.md5" --ignore "*.ign2" "$work_dir_securiteinfo"
 
-      echo "=== MalwarePatrol ==="
+      xshok_pretty_echo_and_log "=== MalwarePatrol ==="
       ls --ignore "*.sig" --ignore "*.md5" --ignore "*.ign2" "$work_dir_malwarepatrol"
 
-      echo "=== Linux Malware Detect ==="
+      xshok_pretty_echo_and_log "=== Linux Malware Detect ==="
       ls --ignore "*.sig" --ignore "*.md5" --ignore "*.ign2" "$work_dir_linuxmalwaredetect"
 
-      echo "=== Linux Malware Detect ==="
+      xshok_pretty_echo_and_log "=== Linux Malware Detect ==="
       ls --ignore "*.sig" --ignore "*.md5" --ignore "*.ign2" "$work_dir_yararulesproject"
 
-      echo "=== User Defined Databases ==="
+      xshok_pretty_echo_and_log "=== User Defined Databases ==="
       ls --ignore "*.sig" --ignore "*.md5" --ignore "*.ign2" "$work_dir_add"
 
-      echo "Check the file name and try again..."
+      xshok_pretty_echo_and_log "Check the file name and try again..."
     fi
   else
     xshok_pretty_echo_and_log "ERROR: Missing value for option" "="
@@ -1029,26 +1029,26 @@ function clamscan_integrity_test_specific_database_file() { # databasefile
 
 # Output names of any third-party signatures that triggered during the HAM directory scan
 function output_signatures_triggered_during_ham_directory_scan() {
-  echo ""
+  xshok_pretty_echo_and_log ""
   if [ -n "$ham_dir" ] ; then
     if [ -r "${work_dir_work_configs}/whitelist.hex" ] ; then
-      echo "The following third-party signatures triggered hits during the HAM Directory scan:"
+      xshok_pretty_echo_and_log "The following third-party signatures triggered hits during the HAM Directory scan:"
 
       $grep_bin -h -f "${work_dir_work_configs}/whitelist.hex" "$work_dir"/*/*.ndb | cut -d ":" -f 1
       $grep_bin -h -f "${work_dir_work_configs}/whitelist.hex" "$work_dir"/*/*.db | cut -d "=" -f 1
     else
-      echo "No third-party signatures have triggered hits during the HAM Directory scan."
+      xshok_pretty_echo_and_log "No third-party signatures have triggered hits during the HAM Directory scan."
     fi
   else
-    echo "Ham directory scanning is not currently enabled in the script's configuration file."
+    xshok_pretty_echo_and_log "Ham directory scanning is not currently enabled in the script's configuration file."
   fi
 }
 
 # Adds a signature whitelist entry in the newer ClamAV IGN2 format
 function add_signature_whitelist_entry() {
-  echo ""
-  echo "Input a third-party signature name that you wish to whitelist due to false-positives"
-  echo "and press enter"
+  xshok_pretty_echo_and_log ""
+  xshok_pretty_echo_and_log "Input a third-party signature name that you wish to whitelist due to false-positives"
+  xshok_pretty_echo_and_log "and press enter"
 
   read -r input
   if [ -n "$input" ] ; then
@@ -1079,31 +1079,31 @@ function add_signature_whitelist_entry() {
             fi
             clamscan_reload_dbs
 
-            echo "Signature '${input}' has been added to my-whitelist.ign2 and"
-            echo "all databases have been reloaded.  The script will track any changes"
-            echo "to the offending signature and will automatically remove it if the"
-            echo "signature is modified or removed from the third-party database."
+            xshok_pretty_echo_and_log "Signature '${input}' has been added to my-whitelist.ign2 and"
+            xshok_pretty_echo_and_log "all databases have been reloaded.  The script will track any changes"
+            xshok_pretty_echo_and_log "to the offending signature and will automatically remove it if the"
+            xshok_pretty_echo_and_log "signature is modified or removed from the third-party database."
           else
 
-            echo "Failed to successfully update my-whitelist.ign2 file - SKIPPING."
+            xshok_pretty_echo_and_log "Failed to successfully update my-whitelist.ign2 file - SKIPPING."
           fi
         else
 
-          echo "Clamscan reports my-whitelist.ign2 database integrity is bad - SKIPPING."
+          xshok_pretty_echo_and_log "Clamscan reports my-whitelist.ign2 database integrity is bad - SKIPPING."
         fi
       else
 
-        echo "Signature '${input}' already exists in my-whitelist.ign2 - no action taken."
+        xshok_pretty_echo_and_log "Signature '${input}' already exists in my-whitelist.ign2 - no action taken."
       fi
     else
 
-      echo "Signature '${input}' could not be found."
+      xshok_pretty_echo_and_log "Signature '${input}' could not be found."
 
-      echo "This script will only create a whitelise entry in my-whitelist.ign2 for ClamAV"
-      echo "'UNOFFICIAL' third-Party signatures as found in the *.ndb *.hdb *.db databases."
+      xshok_pretty_echo_and_log "This script will only create a whitelise entry in my-whitelist.ign2 for ClamAV"
+      xshok_pretty_echo_and_log "'UNOFFICIAL' third-Party signatures as found in the *.ndb *.hdb *.db databases."
     fi
   else
-    echo "No input detected - no action taken."
+    xshok_pretty_echo_and_log "No input detected - no action taken."
   fi
 }
 

From 83aa754e117ec4aa5c04059f1611cb3e350912ce Mon Sep 17 00:00:00 2001
From: eXtremeSHOK <admin@extremeshok.com>
Date: Sun, 18 Aug 2019 01:34:45 +0200
Subject: [PATCH 13/45] xshok_pretty_echo_and_log enhancement auto detect type
 using the first word "error,warning,alert" type e will make a == border type
 w will make a -- border type a will make a ++ border

---
 clamav-unofficial-sigs.sh | 29 +++++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/clamav-unofficial-sigs.sh b/clamav-unofficial-sigs.sh
index 5145d4a7..953e14c3 100644
--- a/clamav-unofficial-sigs.sh
+++ b/clamav-unofficial-sigs.sh
@@ -211,7 +211,11 @@ function xshok_user_group_exists() { # username groupname
 # ========
 # pretty_echo_and_log "" "/\" "7"
 # /\/\/\/\/\/\
-# type: e = error, w= warning, a = alert
+# type: e = error, w= warning, a = alert,
+# will auto detect using the first word "error,warning,alert"
+# type e will make a == border
+# type w will make a -- border
+# type a will make a ++ border
 function xshok_pretty_echo_and_log() { # "string" "repeating" "count" "type"
 	#detect if running under cron and silence
 	if [ "$comment_silence" != "yes" ] ; then
@@ -220,13 +224,30 @@ function xshok_pretty_echo_and_log() { # "string" "repeating" "count" "type"
 		fi
 	fi
 	# always show errors and alerts
-	if [ -n "$4" ] ; then
-		if [ "$4" == "e" ] || [ "$4" == "a" ] ; then
-			comment_silence="no"
+	if [ -z "$4" ] ; then
+		shopt -s nocasematch
+		if [[ $1 =~ "error:" ]] || [[ $1 =~ "error " ]]; then
+			4="e"
+		elif [[ $1 =~ "warning:" ]] || [[ $1 =~ "warning " ]]; then
+			4="w"
+		elif [[ $1 =~ "alert:" ]] || [[ $1 =~ "alert " ]]; then
+			4="a"
 		fi
 	fi
+	if [ "$4" == "e" ] || [ "$4" == "a" ] ; then
+			comment_silence="no"
+	fi
 	# Handle comments is not silenced or type
   if [ "$comment_silence" != "yes" ] ; then
+		if [ -z "$2" ] ; then
+			if [ "$4" == "e" ] ; then
+				2="="
+			elif [ "$4" == "w" ] ; then
+				2="-"
+			elif [ "$4" == "a" ] ; then
+				2="+"
+			fi
+		fi
     if [ "${#@}" -eq 1 ] ; then
       echo "${1}"
     else

From 4c920d05346d3e32049575608ba63b14fb9b5b75 Mon Sep 17 00:00:00 2001
From: eXtremeSHOK <admin@extremeshok.com>
Date: Sun, 18 Aug 2019 01:43:32 +0200
Subject: [PATCH 14/45] more enhancements to xshok_pretty_echo_and_log

---
 clamav-unofficial-sigs.sh | 113 ++++++++++++++++++++------------------
 1 file changed, 59 insertions(+), 54 deletions(-)

diff --git a/clamav-unofficial-sigs.sh b/clamav-unofficial-sigs.sh
index 953e14c3..745f9e66 100644
--- a/clamav-unofficial-sigs.sh
+++ b/clamav-unofficial-sigs.sh
@@ -77,7 +77,7 @@ function xshok_create_pid_file() { # pid.file
       exit 1
     fi
   else
-    xshok_pretty_echo_and_log "ERROR: Missing value for option" "="
+    xshok_pretty_echo_and_log "ERROR: Missing value for option"
     exit 1
   fi
 }
@@ -149,7 +149,7 @@ function xshok_mkdir_ownership() { # path
     fi
     perms chown -f "${clam_user}:${clam_group}" "${1}" > /dev/null 2>&1
   else
-    xshok_pretty_echo_and_log "ERROR: Missing value for option" "="
+    xshok_pretty_echo_and_log "ERROR: Missing value for option"
     exit 1
   fi
 }
@@ -192,7 +192,7 @@ function xshok_user_group_exists() { # username groupname
       return 1 ; # User does NOT exist
     fi
   else
-    xshok_pretty_echo_and_log "ERROR: Missing value for option" "="
+    xshok_pretty_echo_and_log "ERROR: Missing value for option"
     exit 1
   fi
 }
@@ -211,11 +211,12 @@ function xshok_user_group_exists() { # username groupname
 # ========
 # pretty_echo_and_log "" "/\" "7"
 # /\/\/\/\/\/\
-# type: e = error, w= warning, a = alert,
-# will auto detect using the first word "error,warning,alert"
+# type: e = error, w= warning, a = alert, n = notice
+# will auto detect using the first word "error,warning,alert,notice"
 # type e will make a == border
 # type w will make a -- border
-# type a will make a ++ border
+# type a will make a ** border
+# type n will make a ++ border
 function xshok_pretty_echo_and_log() { # "string" "repeating" "count" "type"
 	#detect if running under cron and silence
 	if [ "$comment_silence" != "yes" ] ; then
@@ -232,6 +233,8 @@ function xshok_pretty_echo_and_log() { # "string" "repeating" "count" "type"
 			4="w"
 		elif [[ $1 =~ "alert:" ]] || [[ $1 =~ "alert " ]]; then
 			4="a"
+		elif [[ $1 =~ "notice:" ]] || [[ $1 =~ "notice " ]]; then
+			4="n"
 		fi
 	fi
 	if [ "$4" == "e" ] || [ "$4" == "a" ] ; then
@@ -245,6 +248,8 @@ function xshok_pretty_echo_and_log() { # "string" "repeating" "count" "type"
 			elif [ "$4" == "w" ] ; then
 				2="-"
 			elif [ "$4" == "a" ] ; then
+				2="*"
+			elif [ "$4" == "n" ] ; then
 				2="+"
 			fi
 		fi
@@ -292,11 +297,11 @@ function xshok_pretty_echo_and_log() { # "string" "repeating" "count" "type"
 function xshok_check_s2() { # value1 value2
   if [ "${1}" ] ; then
     if [[ "${1}" =~ ^-.* ]] ; then
-      xshok_pretty_echo_and_log "ERROR: Missing value for option or value begins with -" "="
+      xshok_pretty_echo_and_log "ERROR: Missing value for option or value begins with -"
       exit 1
     fi
   else
-    xshok_pretty_echo_and_log "ERROR: Missing value for option" "="
+    xshok_pretty_echo_and_log "ERROR: Missing value for option"
     exit 1
   fi
 }
@@ -584,7 +589,7 @@ function install_logrotate() {
     touch "${logrotate_dir}/${logrotate_filename}" 2>/dev/null
   fi
   if [ ! -w "${logrotate_dir}/${logrotate_filename}" ] ; then
-    xshok_pretty_echo_and_log "ERROR: logrotate install aborted, as file not writable: ${logrotate_dir}/${logrotate_filename}" "="
+    xshok_pretty_echo_and_log "ERROR: logrotate install aborted, as file not writable: ${logrotate_dir}/${logrotate_filename}"
   else
     # Our template..
     cat << EOF > "${logrotate_dir}/${logrotate_filename}"
@@ -659,7 +664,7 @@ function install_cron() {
     touch "${cron_dir}/${cron_filename}" 2>/dev/null
   fi
   if [ ! -w "${cron_dir}/${cron_filename}" ] ; then
-    xshok_pretty_echo_and_log "ERROR: cron install aborted, as file not writable: ${cron_dir}/${cron_filename}" "="
+    xshok_pretty_echo_and_log "ERROR: cron install aborted, as file not writable: ${cron_dir}/${cron_filename}"
   else
     # Our template..
     cat << EOF > "${cron_dir}/${cron_filename}"
@@ -755,7 +760,7 @@ function hexadecimal_encode_formatted_input_string() {
 function gpg_verify_specific_sanesecurity_database_file() { # databasefile
   xshok_pretty_echo_and_log ""
   if [ "$enable_gpg" == "no" ] ; then
-    xshok_pretty_echo_and_log "Notice: GnuPG / signature verification disabled" "-"
+    xshok_pretty_echo_and_log "GnuPG / signature verification disabled" "-"
   else
     if [ "${1}" ] ; then
       db_file="$(echo "${1}" | awk -F "/" '{print $NF}')"
@@ -780,7 +785,7 @@ function gpg_verify_specific_sanesecurity_database_file() { # databasefile
         ls --ignore "*.sig" --ignore "*.md5" --ignore "*.ign2" "${work_dir_sanesecurity}"
       fi
     else
-      xshok_pretty_echo_and_log "ERROR: Missing value for option" "="
+      xshok_pretty_echo_and_log "ERROR: Missing value for option"
       exit 1
     fi
     exit 1
@@ -1043,7 +1048,7 @@ function clamscan_integrity_test_specific_database_file() { # databasefile
       xshok_pretty_echo_and_log "Check the file name and try again..."
     fi
   else
-    xshok_pretty_echo_and_log "ERROR: Missing value for option" "="
+    xshok_pretty_echo_and_log "ERROR: Missing value for option"
     exit 1
   fi
 }
@@ -1146,16 +1151,16 @@ function clamscan_reload_dbs() {
       fi
 
       if [[ "$($clamd_reload_opt 2>&1)" = *"ERROR"* ]] ; then
-        xshok_pretty_echo_and_log "ERROR: Failed to reload, trying again" "-"
+        xshok_pretty_echo_and_log "ERROR: Failed to reload, trying again"
         if [ -r "$clamd_pid" ] ; then
           mypid="$(cat "$clamd_pid")"
 
           if kill -USR2 "$mypid" ; then
             xshok_pretty_echo_and_log "ClamAV databases Reloaded" "="
           else
-            xshok_pretty_echo_and_log "ERROR: Failed to reload, forcing clamd to restart" "-"
+            xshok_pretty_echo_and_log "ERROR: Failed to reload, forcing clamd to restart"
             if [ -z "$clamd_restart_opt" ] ; then
-              xshok_pretty_echo_and_log "WARNING: Check the script's configuration file, 'reload_dbs' enabled but no 'clamd_restart_opt'" "*"
+              xshok_pretty_echo_and_log "WARNING: Check the script's configuration file, 'reload_dbs' enabled but no 'clamd_restart_opt'"
             else
               if $clamd_restart_opt > /dev/null ; then
                 xshok_pretty_echo_and_log "ClamAV Restarted" "="
@@ -1165,9 +1170,9 @@ function clamscan_reload_dbs() {
             fi
           fi
         else
-          xshok_pretty_echo_and_log "ERROR: Failed to reload, forcing clamd to restart" "-"
+          xshok_pretty_echo_and_log "ERROR: Failed to reload, forcing clamd to restart"
           if [ -z "$clamd_restart_opt" ] ; then
-            xshok_pretty_echo_and_log "WARNING: Check the script's configuration file, 'reload_dbs' enabled but no 'clamd_restart_opt'" "*"
+            xshok_pretty_echo_and_log "WARNING: Check the script's configuration file, 'reload_dbs' enabled but no 'clamd_restart_opt'"
           else
             if $clamd_restart_opt > /dev/null ; then
               xshok_pretty_echo_and_log "ClamAV Restarted" "="
@@ -1211,11 +1216,11 @@ function check_clamav() {
         fi
       fi
       if [ -z "$io_socket1" ] && [ -z "$socket_cat1" ] ; then
-        xshok_pretty_echo_and_log "WARNING: socat or perl module 'IO::Socket::UNIX' not found, cannot test if ClamD is running" "*"
+        xshok_pretty_echo_and_log "WARNING: socat or perl module 'IO::Socket::UNIX' not found, cannot test if ClamD is running"
       else
         if [ -z "$io_socket2" ] && [ -z "$socket_cat2" ] ; then
 
-          xshok_pretty_echo_and_log "ALERT: CLAMD IS NOT RUNNING!" "="
+          xshok_pretty_echo_and_log "ALERT: CLAMD IS NOT RUNNING!"
           if [ -n "$clamd_restart_opt" ] ; then
             xshok_pretty_echo_and_log "Attempting to start ClamD..." "-"
             if [ -n "$io_socket1" ] ; then
@@ -1223,7 +1228,7 @@ function check_clamav() {
               if [ "$(perl -MIO::Socket::UNIX -we '$s = IO::Socket::UNIX->new(shift); $s->print("PING"); print $s->getline; $s->close' "$clamd_socket" 2>/dev/null)" = "PONG" ] ; then
                 xshok_pretty_echo_and_log "ClamD was successfully started" "="
               else
-                xshok_pretty_echo_and_log "ERROR: CLAMD FAILED TO START" "="
+                xshok_pretty_echo_and_log "ERROR: CLAMD FAILED TO START"
                 exit 1
               fi
             else
@@ -1232,7 +1237,7 @@ function check_clamav() {
                 if [ "$( (echo "PING"; sleep 1;) | socat - "$clamd_socket" 2>/dev/null)" == "PONG" ] ; then
                   xshok_pretty_echo_and_log "ClamD was successfully started" "="
                 else
-                  xshok_pretty_echo_and_log "ERROR: CLAMD FAILED TO START" "="
+                  xshok_pretty_echo_and_log "ERROR: CLAMD FAILED TO START"
                   exit 1
                 fi
               fi
@@ -1241,10 +1246,10 @@ function check_clamav() {
         fi
       fi
     else
-      xshok_pretty_echo_and_log "WARNING: ${clamd_socket} is not a usable socket" "*"
+      xshok_pretty_echo_and_log "WARNING: ${clamd_socket} is not a usable socket"
     fi
   else
-    xshok_pretty_echo_and_log "WARNING: clamd_socket is not defined in the configuration file" "*"
+    xshok_pretty_echo_and_log "WARNING: clamd_socket is not defined in the configuration file"
   fi
 }
 
@@ -1259,7 +1264,7 @@ function check_new_version() {
   fi
   if [ "$latest_version" ] ; then
     if [ "$latest_version" != "$script_version" ] ; then
-      xshok_pretty_echo_and_log "New version : v${latest_version} @ https://github.com/extremeshok/clamav-unofficial-sigs" "-"
+      xshok_pretty_echo_and_log "ALERT: New version : v${latest_version} @ https://github.com/extremeshok/clamav-unofficial-sigs"
     fi
   fi
 }
@@ -1275,7 +1280,7 @@ function check_new_config_version() {
   fi
   if [ "$latest_config_version" ] ; then
     if [ "$latest_config_version" != "$config_version" ] ; then
-      xshok_pretty_echo_and_log "New configversion : v${latest_config_version} @ https://github.com/extremeshok/clamav-unofficial-sigs" "-"
+      xshok_pretty_echo_and_log "ALERT: New configversion : v${latest_config_version} @ https://github.com/extremeshok/clamav-unofficial-sigs"
     fi
   fi
 }
@@ -1387,7 +1392,7 @@ elif [ -f "/usr/local/etc/clamav-unofficial-sigs/master.conf" ] ; then
 elif [ -f "/opt/zimbra/conf/clamav-unofficial-sigs/master.conf" ] ; then
   config_dir="/opt/zimbra/conf/clamav-unofficial-sigs/"
 else
-  xshok_pretty_echo_and_log "ERROR: config_dir (/etc/clamav-unofficial-sigs/master.conf) could not be found" "="
+  xshok_pretty_echo_and_log "ERROR: config_dir (/etc/clamav-unofficial-sigs/master.conf) could not be found"
   exit 1
 fi
 # Default config files
@@ -1433,7 +1438,7 @@ fi
 if [ -z "$wget_bin" ] && [ -z "$curl_bin" ]; then
   curl_bin="$(command -v curl 2> /dev/null)"
   if [ -z "$curl_bin" ] ; then
-    xshok_pretty_echo_and_log "ERROR: both wget and curl commands are missing, One of them is required" "="
+    xshok_pretty_echo_and_log "ERROR: both wget and curl commands are missing, One of them is required"
     exit 1
   fi
 fi
@@ -1451,7 +1456,7 @@ dig_bin="$(command -v dig 2> /dev/null)"
 if [ -z "$dig_bin" ] ; then
   host_bin="$(command -v host 2> /dev/null)"
   if [ -z "$host_bin" ] ; then
-    xshok_pretty_echo_and_log "ERROR: both dig and host commands are missing, One of them is required" "="
+    xshok_pretty_echo_and_log "ERROR: both dig and host commands are missing, One of them is required"
     exit 1
   fi
 fi
@@ -1532,7 +1537,7 @@ if [ "$custom_config" != "no" ] ; then
 		if [ -r "${config_dir}/${config_file}" ] && [ "$config_file" != "" ]; then
 			config_files+=( "${config_dir}/${config_file}" )
 		else
-			xshok_pretty_echo_and_log "WARNING: ${config_dir}/os.conf not found" "*"
+			xshok_pretty_echo_and_log "WARNING: ${config_dir}/os.conf not found"
 		fi
 		if [ -r "${config_dir}/user.conf" ] ; then
 			config_files+=( "${config_dir}/user.conf" )
@@ -1584,7 +1589,7 @@ for config_file in "${config_files[@]}" ; do
     # Check "" are an even number
     config_check="${clean_config//[^\"]}"
     if [ "$(( ${#config_check} % 2 ))" -eq 1 ] ; then
-      xshok_pretty_echo_and_log "ERROR: Your configuration has errors, every \" requires a closing \"" "="
+      xshok_pretty_echo_and_log "ERROR: Your configuration has errors, every \" requires a closing \""
       exit 1
     fi
 
@@ -1592,7 +1597,7 @@ for config_file in "${config_files[@]}" ; do
     config_check_vars="$(echo "$clean_config" | $grep_bin -c '=\s*\"' )"
 
     if [ $(( ${#config_check} / 2 )) -ne "$config_check_vars" ] ; then
-      xshok_pretty_echo_and_log "ERROR: Your configuration has errors, every = requires a pair of \"\"" "="
+      xshok_pretty_echo_and_log "ERROR: Your configuration has errors, every = requires a pair of \"\""
       exit 1
     fi
 
@@ -1616,27 +1621,27 @@ fi
 
 # Make sure we have a readable config file
 if [ "$we_have_a_config" == "0" ] ; then
-  xshok_pretty_echo_and_log "ERROR: Config file/s could NOT be read/loaded" "="
+  xshok_pretty_echo_and_log "ERROR: Config file/s could NOT be read/loaded"
   xshok_pretty_echo_and_log "Note: Possible fix would be to checkl the config dir ${config_dir} exists and contains config files"
   exit 1
 fi
 
 # Prevent some issues with an incomplete or only a user.conf being loaded
 if [ "$config_version" == "0" ] ; then
-  xshok_pretty_echo_and_log "ERROR: Config file/s are missing important contents" "="
+  xshok_pretty_echo_and_log "ERROR: Config file/s are missing important contents"
   xshok_pretty_echo_and_log "Note: Possible fix would be to point the script to the dir with the configs"
   exit 1
 fi
 
 # Config version validation
 if [ "$config_version" -lt "$minimum_required_config_version" ] ; then
-  xshok_pretty_echo_and_log "ERROR: Your config version ${config_version} is not compatible with the min required version ${minimum_required_config_version}" "="
+  xshok_pretty_echo_and_log "ERROR: Your config version ${config_version} is not compatible with the min required version ${minimum_required_config_version}"
   exit 1
 fi
 
 # Check to see if the script's "USER CONFIGURATION FILE" has been completed.
 if [ "$user_configuration_complete" != "yes" ] ; then
-  xshok_pretty_echo_and_log "WARNING: SCRIPT CONFIGURATION HAS NOT BEEN COMPLETED" "*"
+  xshok_pretty_echo_and_log "WARNING: SCRIPT CONFIGURATION HAS NOT BEEN COMPLETED"
   xshok_pretty_echo_and_log "Please review the script configuration files"
   xshok_pretty_echo_and_log "and uncomment the following line in user.conf"
   xshok_pretty_echo_and_log "#user_configuration_complete=\"yes\""
@@ -1726,25 +1731,25 @@ shopt -s extglob; clam_dbs="${clam_dbs%%+(/)}"
 # Check default Binaries & Commands are defined
 if [ "$reload_dbs" == "yes" ] ; then
   if [ -z "$clamd_reload_opt" ] ; then
-    xshok_pretty_echo_and_log "ERROR: Missing clamd_reload_opt" "="
+    xshok_pretty_echo_and_log "ERROR: Missing clamd_reload_opt"
     exit 1
   fi
 fi
 if [ -z "$uname_bin" ] ; then
-  xshok_pretty_echo_and_log "ERROR: uname (uname_bin) not found" "="
+  xshok_pretty_echo_and_log "ERROR: uname (uname_bin) not found"
   exit 1
 fi
 if [ -z "$clamscan_bin" ] ; then
-  xshok_pretty_echo_and_log "ERROR: clamscan binary (clamscan_bin) not found" "="
+  xshok_pretty_echo_and_log "ERROR: clamscan binary (clamscan_bin) not found"
   exit 1
 fi
 if [ -z "$rsync_bin" ] ; then
-  xshok_pretty_echo_and_log "ERROR: rsync binary (rsync_bin) not found" "="
+  xshok_pretty_echo_and_log "ERROR: rsync binary (rsync_bin) not found"
   exit 1
 fi
 if [ -z "$wget_bin" ] ; then
   if [ -z "$curl_bin" ] ; then
-    xshok_pretty_echo_and_log "ERROR: wget and curl binaries not found, script requires either wget or curl" "="
+    xshok_pretty_echo_and_log "ERROR: wget and curl binaries not found, script requires either wget or curl"
     exit 1
   fi
 fi
@@ -1768,26 +1773,26 @@ if [ "$enable_gpg" == "yes" ] ; then
   fi
 fi
 if [ "$enable_gpg" != "yes" ] ; then
-  xshok_pretty_echo_and_log "Notice: GnuPG / signature verification disabled" "-"
+  xshok_pretty_echo_and_log "GnuPG / signature verification disabled"
 fi
 # Check default directories are defined
 if [ -z "$work_dir" ] ; then
-  xshok_pretty_echo_and_log "ERROR: working directory (work_dir) not defined" "="
+  xshok_pretty_echo_and_log "ERROR: working directory (work_dir) not defined"
   exit 1
 fi
 if [ -z "$clam_dbs" ] ; then
-  xshok_pretty_echo_and_log "ERROR: clam database directory (clam_dbs) not defined" "="
+  xshok_pretty_echo_and_log "ERROR: clam database directory (clam_dbs) not defined"
   exit 1
 fi
 # Check default directories are writable
 if [ -e "$work_dir" ] ; then
   if [ ! -w "$work_dir" ] ; then
-    xshok_pretty_echo_and_log "ERROR: working directory (work_dir) not writable ${work_dir}" "="
+    xshok_pretty_echo_and_log "ERROR: working directory (work_dir) not writable ${work_dir}"
     exit 1
   fi
 fi
 if [ ! -w "$clam_dbs" ] ; then
-  xshok_pretty_echo_and_log "ERROR: clam database directory (clam_dbs) not writable ${clam_dbs}" "="
+  xshok_pretty_echo_and_log "ERROR: clam database directory (clam_dbs) not writable ${clam_dbs}"
   exit 1
 fi
 
@@ -1821,7 +1826,7 @@ if [ "$enable_locking" == "yes" ] ; then
   if [ -f "$pid_file_fullpath" ] ; then
     pid_file_pid="$(cat "$pid_file_fullpath")"
     if ps -p "$pid_file_pid" > /dev/null 2>&1 ; then
-      xshok_pretty_echo_and_log "ERROR: Only one instance can run at the same time." "="
+      xshok_pretty_echo_and_log "ERROR: Only one instance can run at the same time."
       exit 1
     else
       xshok_create_pid_file "$pid_file_fullpath"
@@ -1835,7 +1840,7 @@ fi
 
 # Verify the clam_user and clam_group actually exists on the system
 if ! xshok_user_group_exists "${clam_user}" "${clam_group}" ; then
-  xshok_pretty_echo_and_log "ERROR: Either the user: ${clam_user} and/or group: ${clam_group} does not exist on the system." "="
+  xshok_pretty_echo_and_log "ERROR: Either the user: ${clam_user} and/or group: ${clam_group} does not exist on the system."
   exit 1
 fi
 
@@ -1926,7 +1931,7 @@ if [ "$enable_yararules" == "yes" ] ; then
   if [ "$current_clamav_version" -lt "$minimum_yara_clamav_version" ] ; then # Older
     yararulesproject_enabled="no"
     enable_yararules="no"
-    xshok_pretty_echo_and_log "Notice: Yararules Disabled due to clamav being older than the minimum required version"
+    xshok_pretty_echo_and_log "Yararules Disabled due to clamav being older than the minimum required version"
   fi
 else
   yararulesproject_enabled="no"
@@ -2064,13 +2069,13 @@ if [ "$enable_gpg" == "yes" ] ; then
     xshok_file_download "${work_dir_gpg}/publickey.gpg" "$sanesecurity_gpg_url"
     ret="$?"
     if [ "$ret" -ne 0 ] ; then
-      xshok_pretty_echo_and_log "ALERT: Could not download Sanesecurity public GPG key" "*"
+      xshok_pretty_echo_and_log "ALERT: Could not download Sanesecurity public GPG key"
       exit 1
     else
       xshok_pretty_echo_and_log "Sanesecurity public GPG key successfully downloaded"
       rm -f -- "${work_dir_gpg}/ss-keyring.gp*"
       if ! $gpg_bin -q --no-options --no-default-keyring --homedir "${work_dir_gpg}" --keyring "${work_dir_gpg}/ss-keyring.gpg" --import "${work_dir_gpg}/publickey.gpg" 2>/dev/null ; then
-        xshok_pretty_echo_and_log "ALERT: could not import Sanesecurity public GPG key to custom keyring" "*"
+        xshok_pretty_echo_and_log "ALERT: could not import Sanesecurity public GPG key to custom keyring"
         exit 1
       else
         chmod -f 0644 "${work_dir_gpg}/*.*"
@@ -2082,7 +2087,7 @@ if [ "$enable_gpg" == "yes" ] ; then
   if [ ! -s "${work_dir_gpg}/ss-keyring.gpg" ] ; then
     rm -f -- "${work_dir_gpg}/ss-keyring.gp*"
     if ! $gpg_bin -q --no-options --no-default-keyring --homedir "${work_dir_gpg}" --keyring "${work_dir_gpg}/ss-keyring.gpg" --import "${work_dir_gpg}/publickey.gpg" 2>/dev/null ; then
-      xshok_pretty_echo_and_log "ALERT: Custom keyring MISSING or CORRUPT!  Could not import Sanesecurity public GPG key to custom keyring" "*"
+      xshok_pretty_echo_and_log "ALERT: Custom keyring MISSING or CORRUPT!  Could not import Sanesecurity public GPG key to custom keyring"
       exit 1
     else
       chmod -f 0644 "${work_dir_gpg}/*.*"
@@ -2241,7 +2246,7 @@ if [ -n "${securiteinfo_dbs[0]}" ] || [ -n "$malwarepatrol_db" ] ; then
     current_time="$(perl -le print+time 2> /dev/null)"
   fi
   if [ "$current_time" -le 0 ] ; then
-    xshok_pretty_echo_and_log "WARNING: No support for 'date +%s' or 'perl' was not found , SecuriteInfo and MalwarePatrol updates bypassed" "="
+    xshok_pretty_echo_and_log "WARNING: No support for 'date +%s' or 'perl' was not found , SecuriteInfo and MalwarePatrol updates bypassed"
     securiteinfo_dbs=()
     malwarepatrol_db=()
   fi
@@ -3245,7 +3250,7 @@ if [ -n "$ham_dir" ] ; then
     mv -f "${work_dir_work_configs}/whitelist.tmp" "${work_dir_work_configs}/whitelist.hex"
     rm -f "${work_dir_work_configs}/whitelist.txt"
     rm -f "${test_dir}/*.*"
-    xshok_pretty_echo_and_log "WARNING: Signature(s) triggered on HAM directory scan - signature(s) removed" "*"
+    xshok_pretty_echo_and_log "WARNING: Signature(s) triggered on HAM directory scan - signature(s) removed"
   else
     xshok_pretty_echo_and_log "No signatures triggered on HAM directory scan" "="
   fi

From 73564527886a92d48418f241289c22f4eaf79ecf Mon Sep 17 00:00:00 2001
From: eXtremeSHOK <admin@extremeshok.com>
Date: Sun, 18 Aug 2019 01:48:09 +0200
Subject: [PATCH 15/45] add MAILTO=root to the cron file fixes #186

---
 clamav-unofficial-sigs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/clamav-unofficial-sigs.sh b/clamav-unofficial-sigs.sh
index 745f9e66..2303dbcd 100644
--- a/clamav-unofficial-sigs.sh
+++ b/clamav-unofficial-sigs.sh
@@ -695,7 +695,7 @@ function install_cron() {
 # script itself is set to randomize the actual execution time between
 # 60 - 600 seconds.  To Adjust the cron values, edit your configs and run
 # bash clamav-unofficial-sigs.sh --install-cron to generate a new file.
-
+MAILTO=root
 $cron_minute * * * * ${cron_sudo} ${cron_user} [ -x ${cron_script_full_path} ] && ${cron_bash} ${cron_script_full_path} > /dev/null
 
 # https://eXtremeSHOK.com ######################################################

From 4f755ae1d95acc609611938a21a6bec87327f87d Mon Sep 17 00:00:00 2001
From: eXtremeSHOK <admin@extremeshok.com>
Date: Sun, 18 Aug 2019 02:03:50 +0200
Subject: [PATCH 16/45] fix service name

---
 config/os.centos7.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/os.centos7.conf b/config/os.centos7.conf
index 458ac866..4f395b1d 100644
--- a/config/os.centos7.conf
+++ b/config/os.centos7.conf
@@ -27,7 +27,7 @@ clam_dbs="/var/lib/clamav"
 
 clamd_pid="/var/run/clamd.scan/clamd.pid"
 
-clamd_restart_opt="systemctl restart clamd@scan"
+clamd_restart_opt="systemctl restart clamd.scan"
 
 #clamd_socket="/var/run/clamd.scan/clamd.sock"
 

From 3637cacee3b45ca82560a4e4ed23d1c6bc93f003 Mon Sep 17 00:00:00 2001
From: eXtremeSHOK <admin@extremeshok.com>
Date: Sun, 18 Aug 2019 02:19:50 +0200
Subject: [PATCH 17/45] full proxy support for wget, curl, rsync, dig, host
 fixes #230

---
 clamav-unofficial-sigs.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/clamav-unofficial-sigs.sh b/clamav-unofficial-sigs.sh
index 2303dbcd..0d22fccd 100644
--- a/clamav-unofficial-sigs.sh
+++ b/clamav-unofficial-sigs.sh
@@ -340,7 +340,7 @@ function xshok_file_download() { #outputfile #url #notimestamp
 					fi
 				fi
 	      # shellcheck disable=SC2086
-				$wget_bin $wget_compression $wget_proxy_https $wget_proxy_http $wget_insecure $wget_output_level --connect-timeout="${downloader_connect_timeout}" --random-wait --tries="${downloader_tries}" --timeout="${downloader_max_time}" --timestamping "${2}"
+				$wget_bin $wget_compression $wget_proxy $wget_insecure $wget_output_level --connect-timeout="${downloader_connect_timeout}" --random-wait --tries="${downloader_tries}" --timeout="${downloader_max_time}" --timestamping "${2}"
 				result=$?
 				if [ ! -n "$wget_output_link" ] ; then
 					if [ -L "$wget_output_link" ] ; then
@@ -349,7 +349,7 @@ function xshok_file_download() { #outputfile #url #notimestamp
 				fi
 			else
 				# shellcheck disable=SC2086
-				$wget_bin $wget_compression $wget_proxy_https $wget_proxy_http $wget_insecure $wget_output_level --connect-timeout="${downloader_connect_timeout}" --random-wait --tries="${downloader_tries}" --timeout="${downloader_max_time}" --output-document="${1}" "${2}"
+				$wget_bin $wget_compression $wget_proxy $wget_insecure $wget_output_level --connect-timeout="${downloader_connect_timeout}" --random-wait --tries="${downloader_tries}" --timeout="${downloader_max_time}" --output-document="${1}" "${2}"
 				result=$?
 			fi
     else
@@ -1257,7 +1257,7 @@ function check_clamav() {
 function check_new_version() {
   if [ -n "$wget_bin" ] ; then
     # shellcheck disable=SC2086
-    latest_version="$($wget_bin $wget_compression $wget_proxy_https $wget_proxy_http $wget_insecure $wget_output_level --connect-timeout="${downloader_connect_timeout}" --random-wait --tries="${downloader_tries}" --timeout="${downloader_max_time}" https://raw.githubusercontent.com/extremeshok/clamav-unofficial-sigs/master/clamav-unofficial-sigs.sh -O - 2> /dev/null | $grep_bin "^script_version=" | head -n1 | cut -d '"' -f 2)"
+    latest_version="$($wget_bin $wget_compression $wget_proxy $wget_insecure $wget_output_level --connect-timeout="${downloader_connect_timeout}" --random-wait --tries="${downloader_tries}" --timeout="${downloader_max_time}" https://raw.githubusercontent.com/extremeshok/clamav-unofficial-sigs/master/clamav-unofficial-sigs.sh -O - 2> /dev/null | $grep_bin "^script_version=" | head -n1 | cut -d '"' -f 2)"
 	else
     # shellcheck disable=SC2086
     latest_version="$($curl_bin --compress $curl_proxy $curl_insecure $curl_output_level --connect-timeout "${downloader_connect_timeout}" --remote-time --location --retry "${downloader_tries}" --max-time "${downloader_max_time}" https://raw.githubusercontent.com/extremeshok/clamav-unofficial-sigs/master/clamav-unofficial-sigs.sh 2> /dev/null | $grep_bin "^script_version=" | head -n1 | cut -d '"' -f 2)"
@@ -1273,7 +1273,7 @@ function check_new_version() {
 function check_new_config_version() {
   if [ -n "$wget_bin" ] ; then
     # shellcheck disable=SC2086
-    latest_config_version="$($wget_bin $wget_compression $wget_proxy_https $wget_proxy_http $wget_insecure $wget_output_level --connect-timeout="${downloader_connect_timeout}" --random-wait --tries="${downloader_tries}" --timeout="${downloader_max_time}" https://raw.githubusercontent.com/extremeshok/clamav-unofficial-sigs/master/config/master.conf -O - 2> /dev/null | $grep_bin "^config_version=" | head -n1 | cut -d '"' -f 2)"
+    latest_config_version="$($wget_bin $wget_compression $wget_proxy $wget_insecure $wget_output_level --connect-timeout="${downloader_connect_timeout}" --random-wait --tries="${downloader_tries}" --timeout="${downloader_max_time}" https://raw.githubusercontent.com/extremeshok/clamav-unofficial-sigs/master/config/master.conf -O - 2> /dev/null | $grep_bin "^config_version=" | head -n1 | cut -d '"' -f 2)"
   else
     # shellcheck disable=SC2086
     latest_config_version="$($curl_bin --compress $curl_proxy $curl_insecure $curl_output_level --connect-timeout "${downloader_connect_timeout}" --remote-time --location --retry "${downloader_tries}" --max-time "${downloader_max_time}" https://raw.githubusercontent.com/extremeshok/clamav-unofficial-sigs/master/config/master.conf 2> /dev/null | $grep_bin "^config_version=" | head -n1 | cut -d '"' -f 2)"
@@ -2272,19 +2272,19 @@ if [ "$sanesecurity_enabled" == "yes" ] ; then
         xshok_pretty_echo_and_log "Sanesecurity Database & GPG Signature File Updates" "="
         xshok_pretty_echo_and_log "Checking for Sanesecurity updates..."
 
-        sanesecurity_mirror_ips="$(dig +ignore +short "$sanesecurity_url")"
+        sanesecurity_mirror_ips="$(dig $dig_proxy +ignore +short "$sanesecurity_url")"
         # Add fallback to host if dig returns no records
         if [ ${#sanesecurity_mirror_ips} -lt 1 ] ; then
-          sanesecurity_mirror_ips="$(host -t A "$sanesecurity_url" | sed -n '/has address/{s/.*address \([^ ]*\).*/\1/;p;}')"
+          sanesecurity_mirror_ips="$(host $host_proxy -t A "$sanesecurity_url" | sed -n '/has address/{s/.*address \([^ ]*\).*/\1/;p;}')"
         fi
 
         if [ ${#sanesecurity_mirror_ips} -ge 1 ] ; then
           for sanesecurity_mirror_ip in $sanesecurity_mirror_ips ; do
             sanesecurity_mirror_name=""
-            sanesecurity_mirror_name="$(dig +short -x "$sanesecurity_mirror_ip" | command sed 's/\.$//')"
+            sanesecurity_mirror_name="$(dig $dig_proxy +short -x "$sanesecurity_mirror_ip" | command sed 's/\.$//')"
             # Add fallback to host if dig returns no records
             if [ -z "$sanesecurity_mirror_name" ] ; then
-              sanesecurity_mirror_name="$(host "$sanesecurity_mirror_ip" | sed -n '/name pointer/{s/.*pointer \([^ ]*\).*\.$/\1/;p;}')"
+              sanesecurity_mirror_name="$(host $host_proxy "$sanesecurity_mirror_ip" | sed -n '/name pointer/{s/.*pointer \([^ ]*\).*\.$/\1/;p;}')"
             fi
             sanesecurity_mirror_site_info="$sanesecurity_mirror_name $sanesecurity_mirror_ip"
             xshok_pretty_echo_and_log "Sanesecurity mirror site used: ${sanesecurity_mirror_site_info}"

From 7c2bf754d484be02d896f84f7659533da80bb452 Mon Sep 17 00:00:00 2001
From: eXtremeSHOK <admin@extremeshok.com>
Date: Sun, 18 Aug 2019 02:21:44 +0200
Subject: [PATCH 18/45] better proxy config varibles

---
 config/master.conf | 18 ++++++++----------
 config/user.conf   |  8 ++++++++
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/config/master.conf b/config/master.conf
index 1b60bc5e..efc2d08f 100644
--- a/config/master.conf
+++ b/config/master.conf
@@ -479,15 +479,13 @@ remove_disabled_databases="no" # Default is "no" since we are not a database man
 #
 selinux_fixes="no" # Default is "no" ignore ssl errors and warnings
 
-# If necessary to proxy database downloads, define the rsync and/or wget
-# proxy settings here.  For rsync, the proxy must support connections to
-# port 873.  Both wget and rsync proxy setting need to be defined in the
-# format of "hostname:port".  For wget, also note the https and http
-#rsync_proxy=""
-#curl_proxy=""
-#wget_proxy_http="-e http_proxy=http://username:password@proxy_host:proxy_port"
-#wget_proxy_https="-e https_proxy=https://username:password@proxy_host:proxy_port"
-
+# Proxy Support
+# If necessary to proxy database downloads, define the rsync, curl, wget, dig, hosr proxy settings here.
+#rsync_proxy="username:password@proxy_host:proxy_port"
+#curl_proxy="--proxy http://username:password@proxy_host:proxy_port"
+#wget_proxy"-e http_proxy=http://username:password@proxy_host:proxy_port -e https_proxy=https://username:password@proxy_host:proxy_port"
+#dig_proxy="@proxy_host -p proxy_host:proxy_port"
+#host_proxy="@proxy_host" #does not support port
 
 # Custom Cron install settings, these are detected and only used if you want to override
 # the automatic detection and generation of the values when not set, this is mainly to aid package maintainers
@@ -547,6 +545,6 @@ yararulesproject_url="https://raw.githubusercontent.com/Yara-Rules/rules/master"
 
 # ========================
 # DO NOT EDIT !
-config_version="75"
+config_version="76"
 
 # https://eXtremeSHOK.com ######################################################
diff --git a/config/user.conf b/config/user.conf
index 7958fbfc..c6e82e5a 100644
--- a/config/user.conf
+++ b/config/user.conf
@@ -51,4 +51,12 @@
 # Uncomment the following line to enable the script
 #user_configuration_complete="yes"
 
+# Proxy Support
+# If necessary to proxy database downloads, define the rsync, curl, wget, dig, hosr proxy settings here.
+#rsync_proxy="username:password@proxy_host:proxy_port"
+#curl_proxy="--proxy http://username:password@proxy_host:proxy_port"
+#wget_proxy"-e http_proxy=http://username:password@proxy_host:proxy_port -e https_proxy=https://username:password@proxy_host:proxy_port"
+#dig_proxy="@proxy_host -p proxy_host:proxy_port"
+#host_proxy="@proxy_host" #does not support port
+
 # https://eXtremeSHOK.com ######################################################

From 14feb45ff1674c72be15eb460034304977e9875b Mon Sep 17 00:00:00 2001
From: eXtremeSHOK <admin@extremeshok.com>
Date: Sun, 18 Aug 2019 02:34:50 +0200
Subject: [PATCH 19/45] minor fixes

---
 clamav-unofficial-sigs.sh | 66 +++++++++++++++++++++------------------
 1 file changed, 36 insertions(+), 30 deletions(-)

diff --git a/clamav-unofficial-sigs.sh b/clamav-unofficial-sigs.sh
index 0d22fccd..c4d57bea 100644
--- a/clamav-unofficial-sigs.sh
+++ b/clamav-unofficial-sigs.sh
@@ -219,51 +219,53 @@ function xshok_user_group_exists() { # username groupname
 # type n will make a ++ border
 function xshok_pretty_echo_and_log() { # "string" "repeating" "count" "type"
 	#detect if running under cron and silence
+	mystring="$1"
+	myrepeating="$2"
+	mycount="$3"
+	mytype="$4"
 	if [ "$comment_silence" != "yes" ] ; then
 		if [ ! -t 1 ] ; then
 			comment_silence="yes"
 		fi
 	fi
 	# always show errors and alerts
-	if [ -z "$4" ] ; then
+	if [ -z "$mytype" ] ; then
 		shopt -s nocasematch
-		if [[ $1 =~ "error:" ]] || [[ $1 =~ "error " ]]; then
-			4="e"
-		elif [[ $1 =~ "warning:" ]] || [[ $1 =~ "warning " ]]; then
-			4="w"
-		elif [[ $1 =~ "alert:" ]] || [[ $1 =~ "alert " ]]; then
-			4="a"
-		elif [[ $1 =~ "notice:" ]] || [[ $1 =~ "notice " ]]; then
-			4="n"
+		if [[ $mystring =~ "error:" ]] || [[ $mystring =~ "error " ]] ; then
+			mytype="e"
+		elif [[ $mystring =~ "warning:" ]] || [[ $mystring =~ "warning " ]] ; then
+			mytype="w"
+		elif [[ $mystring =~ "alert:" ]] || [[ $mystring =~ "alert " ]] ; then
+			mytype="a"
+		elif [[ $mystring =~ "notice:" ]] || [[ $mystring =~ "notice " ]] ; then
+			mytype="n"
 		fi
 	fi
-	if [ "$4" == "e" ] || [ "$4" == "a" ] ; then
+	if [ "$mytype" == "e" ] || [ "$mytype" == "a" ] ; then
 			comment_silence="no"
 	fi
 	# Handle comments is not silenced or type
   if [ "$comment_silence" != "yes" ] ; then
-		if [ -z "$2" ] ; then
-			if [ "$4" == "e" ] ; then
-				2="="
-			elif [ "$4" == "w" ] ; then
-				2="-"
-			elif [ "$4" == "a" ] ; then
-				2="*"
-			elif [ "$4" == "n" ] ; then
-				2="+"
+		if [ -z "$myrepeating" ] ; then
+			if [ "$mytype" == "e" ] ; then
+				myrepeating="="
+			elif [ "$mytype" == "w" ] ; then
+				myrepeating="-"
+			elif [ "$mytype" == "a" ] ; then
+				myrepeating="*"
+			elif [ "$mytype" == "n" ] ; then
+				myrepeating="+"
 			fi
 		fi
     if [ "${#@}" -eq 1 ] ; then
       echo "${1}"
     else
       myvar=""
-      if [ -n "$3" ] ; then
-        mycount="$3"
-      else
+      if [ -z "$mycount" ] ; then
         mycount="${#1}"
       fi
       for (( n = 0; n < mycount; n++ )) ; do
-        myvar="${myvar}${2}"
+        myvar="${myvar}${myrepeating}"
       done
       if [ -n "${1}" ] ; then
         echo -e "${myvar}\\n${1}\\n${myvar}"
@@ -1257,10 +1259,10 @@ function check_clamav() {
 function check_new_version() {
   if [ -n "$wget_bin" ] ; then
     # shellcheck disable=SC2086
-    latest_version="$($wget_bin $wget_compression $wget_proxy $wget_insecure $wget_output_level --connect-timeout="${downloader_connect_timeout}" --random-wait --tries="${downloader_tries}" --timeout="${downloader_max_time}" https://raw.githubusercontent.com/extremeshok/clamav-unofficial-sigs/master/clamav-unofficial-sigs.sh -O - 2> /dev/null | $grep_bin "^script_version=" | head -n1 | cut -d '"' -f 2)"
+    latest_version="$($wget_bin $wget_compression $wget_proxy $wget_insecure $wget_output_level --connect-timeout="${downloader_connect_timeout}" --random-wait --tries="${downloader_tries}" --timeout="${downloader_max_time}" "https://raw.githubusercontent.com/extremeshok/clamav-unofficial-sigs/${git_branch}/clamav-unofficial-sigs.sh" -O - 2> /dev/null | $grep_bin "^script_version=" | head -n1 | cut -d '"' -f 2)"
 	else
     # shellcheck disable=SC2086
-    latest_version="$($curl_bin --compress $curl_proxy $curl_insecure $curl_output_level --connect-timeout "${downloader_connect_timeout}" --remote-time --location --retry "${downloader_tries}" --max-time "${downloader_max_time}" https://raw.githubusercontent.com/extremeshok/clamav-unofficial-sigs/master/clamav-unofficial-sigs.sh 2> /dev/null | $grep_bin "^script_version=" | head -n1 | cut -d '"' -f 2)"
+    latest_version="$($curl_bin --compress $curl_proxy $curl_insecure $curl_output_level --connect-timeout "${downloader_connect_timeout}" --remote-time --location --retry "${downloader_tries}" --max-time "${downloader_max_time}" "https://raw.githubusercontent.com/extremeshok/clamav-unofficial-sigs/${git_branch}/clamav-unofficial-sigs.sh" 2> /dev/null | $grep_bin "^script_version=" | head -n1 | cut -d '"' -f 2)"
   fi
   if [ "$latest_version" ] ; then
     if [ "$latest_version" != "$script_version" ] ; then
@@ -1273,10 +1275,10 @@ function check_new_version() {
 function check_new_config_version() {
   if [ -n "$wget_bin" ] ; then
     # shellcheck disable=SC2086
-    latest_config_version="$($wget_bin $wget_compression $wget_proxy $wget_insecure $wget_output_level --connect-timeout="${downloader_connect_timeout}" --random-wait --tries="${downloader_tries}" --timeout="${downloader_max_time}" https://raw.githubusercontent.com/extremeshok/clamav-unofficial-sigs/master/config/master.conf -O - 2> /dev/null | $grep_bin "^config_version=" | head -n1 | cut -d '"' -f 2)"
+    latest_config_version="$($wget_bin $wget_compression $wget_proxy $wget_insecure $wget_output_level --connect-timeout="${downloader_connect_timeout}" --random-wait --tries="${downloader_tries}" --timeout="${downloader_max_time}" "https://raw.githubusercontent.com/extremeshok/clamav-unofficial-sigs/${git_branch}/config/master.conf" -O - 2> /dev/null | $grep_bin "^config_version=" | head -n1 | cut -d '"' -f 2)"
   else
     # shellcheck disable=SC2086
-    latest_config_version="$($curl_bin --compress $curl_proxy $curl_insecure $curl_output_level --connect-timeout "${downloader_connect_timeout}" --remote-time --location --retry "${downloader_tries}" --max-time "${downloader_max_time}" https://raw.githubusercontent.com/extremeshok/clamav-unofficial-sigs/master/config/master.conf 2> /dev/null | $grep_bin "^config_version=" | head -n1 | cut -d '"' -f 2)"
+    latest_config_version="$($curl_bin --compress $curl_proxy $curl_insecure $curl_output_level --connect-timeout "${downloader_connect_timeout}" --remote-time --location --retry "${downloader_tries}" --max-time "${downloader_max_time}" "https://raw.githubusercontent.com/extremeshok/clamav-unofficial-sigs/${git_branch}/config/master.conf" 2> /dev/null | $grep_bin "^config_version=" | head -n1 | cut -d '"' -f 2)"
   fi
   if [ "$latest_config_version" ] ; then
     if [ "$latest_config_version" != "$config_version" ] ; then
@@ -1369,9 +1371,9 @@ EOF
 ################################################################################
 
 # Script Info
-script_version="6.0.1"
-script_version_date="2019-07-30"
-minimum_required_config_version="75"
+script_version="6.0.2"
+script_version_date="2019-08-18"
+minimum_required_config_version="76"
 minimum_yara_clamav_version="0.99"
 
 #allow for other negatives besides no.
@@ -2119,6 +2121,10 @@ if [ ! -s "${work_dir_work_configs}/scan-test.txt" ] ; then
   echo "This is the clamscan test file..." > "${work_dir_work_configs}/scan-test.txt"
 fi
 
+if [ -z "$git_branch" ] ; then
+	git_branch="master"
+fi
+
 # If rsync proxy is defined in the config file, then export it for use.
 if [ -n "$rsync_proxy" ] ; then
   RSYNC_PROXY="$rsync_proxy"

From 5f8c5a8c2132acc50443405a1b0f7ac46a8a3e1f Mon Sep 17 00:00:00 2001
From: eXtremeSHOK <admin@extremeshok.com>
Date: Sun, 18 Aug 2019 02:44:45 +0200
Subject: [PATCH 20/45] complete refactor of xshok_pretty_echo_and_log

---
 clamav-unofficial-sigs.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/clamav-unofficial-sigs.sh b/clamav-unofficial-sigs.sh
index c4d57bea..8341a76f 100644
--- a/clamav-unofficial-sigs.sh
+++ b/clamav-unofficial-sigs.sh
@@ -231,13 +231,13 @@ function xshok_pretty_echo_and_log() { # "string" "repeating" "count" "type"
 	# always show errors and alerts
 	if [ -z "$mytype" ] ; then
 		shopt -s nocasematch
-		if [[ $mystring =~ "error:" ]] || [[ $mystring =~ "error " ]] ; then
+		if [[ "$mystring" =~ "error:" ]] || [[ "$mystring" =~ "error " ]] ; then
 			mytype="e"
-		elif [[ $mystring =~ "warning:" ]] || [[ $mystring =~ "warning " ]] ; then
+		elif [[ "$mystring" =~ "warning:" ]] || [[ "$mystring" =~ "warning " ]] ; then
 			mytype="w"
-		elif [[ $mystring =~ "alert:" ]] || [[ $mystring =~ "alert " ]] ; then
+		elif [[ "$mystring" =~ "alert:" ]] || [[ "$mystring" =~ "alert " ]] ; then
 			mytype="a"
-		elif [[ $mystring =~ "notice:" ]] || [[ $mystring =~ "notice " ]] ; then
+		elif [[ "$mystring" =~ "notice:" ]] || [[ "$mystring" =~ "notice " ]] ; then
 			mytype="n"
 		fi
 	fi
@@ -257,17 +257,17 @@ function xshok_pretty_echo_and_log() { # "string" "repeating" "count" "type"
 				myrepeating="+"
 			fi
 		fi
-    if [ "${#@}" -eq 1 ] ; then
-      echo "${1}"
+    if [ -z "$myrepeating" ] ; then
+      echo "${mystring}"
     else
       myvar=""
       if [ -z "$mycount" ] ; then
-        mycount="${#1}"
+        mycount="${#mystring}"
       fi
       for (( n = 0; n < mycount; n++ )) ; do
         myvar="${myvar}${myrepeating}"
       done
-      if [ -n "${1}" ] ; then
+      if [ -n "${mystring}" ] ; then
         echo -e "${myvar}\\n${1}\\n${myvar}"
       else
         echo -e "${myvar}"

From f19c831a5aa3613cd89c1cae094652ca63d9697b Mon Sep 17 00:00:00 2001
From: eXtremeSHOK <admin@extremeshok.com>
Date: Sun, 18 Aug 2019 02:45:48 +0200
Subject: [PATCH 21/45] new config variable: git_branch

---
 config/master.conf | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/config/master.conf b/config/master.conf
index efc2d08f..2b83512f 100644
--- a/config/master.conf
+++ b/config/master.conf
@@ -384,6 +384,9 @@ Crypto/crypto.yar|HIGH # detect the existence of cryptographic algoritms
 # ==================================================
 # ==================================================
 
+# Branch for update checking, default: master
+git_branch="master"
+
 # Enable or disable download time randomization.  This allows the script to
 # be executed via cron, but the actual database file checking will pause
 # for a random number of seconds between the "min" and "max" time settings

From c40d34890c790779f7f193e01013c14ccb55cf96 Mon Sep 17 00:00:00 2001
From: eXtremeSHOK <admin@extremeshok.com>
Date: Sun, 18 Aug 2019 02:57:21 +0200
Subject: [PATCH 22/45] happy shellcheck = happy life

---
 clamav-unofficial-sigs.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/clamav-unofficial-sigs.sh b/clamav-unofficial-sigs.sh
index 8341a76f..1237f799 100644
--- a/clamav-unofficial-sigs.sh
+++ b/clamav-unofficial-sigs.sh
@@ -2277,19 +2277,22 @@ if [ "$sanesecurity_enabled" == "yes" ] ; then
         echo "$current_time" > "${work_dir_work_configs}/last-ss-update.txt"
         xshok_pretty_echo_and_log "Sanesecurity Database & GPG Signature File Updates" "="
         xshok_pretty_echo_and_log "Checking for Sanesecurity updates..."
-
+				# shellcheck disable=SC2086
         sanesecurity_mirror_ips="$(dig $dig_proxy +ignore +short "$sanesecurity_url")"
         # Add fallback to host if dig returns no records
         if [ ${#sanesecurity_mirror_ips} -lt 1 ] ; then
+					# shellcheck disable=SC2086
           sanesecurity_mirror_ips="$(host $host_proxy -t A "$sanesecurity_url" | sed -n '/has address/{s/.*address \([^ ]*\).*/\1/;p;}')"
         fi
 
         if [ ${#sanesecurity_mirror_ips} -ge 1 ] ; then
           for sanesecurity_mirror_ip in $sanesecurity_mirror_ips ; do
             sanesecurity_mirror_name=""
+						# shellcheck disable=SC2086
             sanesecurity_mirror_name="$(dig $dig_proxy +short -x "$sanesecurity_mirror_ip" | command sed 's/\.$//')"
             # Add fallback to host if dig returns no records
             if [ -z "$sanesecurity_mirror_name" ] ; then
+							# shellcheck disable=SC2086
               sanesecurity_mirror_name="$(host $host_proxy "$sanesecurity_mirror_ip" | sed -n '/name pointer/{s/.*pointer \([^ ]*\).*\.$/\1/;p;}')"
             fi
             sanesecurity_mirror_site_info="$sanesecurity_mirror_name $sanesecurity_mirror_ip"

From 390cbc60ac533144107feaa36a57afd829031522 Mon Sep 17 00:00:00 2001
From: eXtremeSHOK <admin@extremeshok.com>
Date: Sun, 18 Aug 2019 04:02:58 +0200
Subject: [PATCH 23/45] allow -w <signature> for quicker whitelisting

---
 clamav-unofficial-sigs.sh | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/clamav-unofficial-sigs.sh b/clamav-unofficial-sigs.sh
index 1237f799..68516566 100644
--- a/clamav-unofficial-sigs.sh
+++ b/clamav-unofficial-sigs.sh
@@ -1073,12 +1073,15 @@ function output_signatures_triggered_during_ham_directory_scan() {
 }
 
 # Adds a signature whitelist entry in the newer ClamAV IGN2 format
-function add_signature_whitelist_entry() {
-  xshok_pretty_echo_and_log ""
-  xshok_pretty_echo_and_log "Input a third-party signature name that you wish to whitelist due to false-positives"
-  xshok_pretty_echo_and_log "and press enter"
+function add_signature_whitelist_entry() { #signature
+  xshok_pretty_echo_and_log "Signature Whitelist" "="
 
-  read -r input
+	if [ -n "$1" ] ; then
+		input="$1"
+	else
+		xshok_pretty_echo_and_log "Input a third-party signature name that you wish to whitelist and press enter"
+		read -r input
+	fi
   if [ -n "$input" ] ; then
     cd "$clam_dbs" || exit
 		# Remove quotes and .UNOFFICIAL from the string
@@ -1553,7 +1556,7 @@ for config_file in "${config_files[@]}" ; do
   if [ -r "$config_file" ] ; then # Exists and readable
     we_have_a_config="1"
     # Config stripping
-    xshok_pretty_echo_and_log "Loading config: ${config_file}" "="
+    xshok_pretty_echo_and_log "Loading config: ${config_file}"
 
     if [ "$(uname -s)" == "SunOS" ] ; then
       # Solaris FIXES only, i had issues with running with a single command..
@@ -1912,7 +1915,7 @@ while true; do
     -m|--make-database) make_signature_database_from_ascii_file; exit ;;
     -t|--test-database) xshok_check_s2 "${2}"; clamscan_integrity_test_specific_database_file "${2}"; exit ;;
     -o|--output-triggered) output_signatures_triggered_during_ham_directory_scan; exit ;;
-    -w|--whitelist) add_signature_whitelist_entry; exit ;;
+    -w|--whitelist) add_signature_whitelist_entry "${2}"; exit ;;
     --check-clamav) check_clamav; exit ;;
     --install-all) install_cron; install_logrotate; install_man; exit ;;
     --install-cron) install_cron; exit ;;

From 9688337b42712eaf5c2a2a2c100b5e65998fa0df Mon Sep 17 00:00:00 2001
From: eXtremeSHOK <admin@extremeshok.com>
Date: Sun, 18 Aug 2019 04:58:43 +0200
Subject: [PATCH 24/45] Full support for Hash-based Signature Databases

---
 clamav-unofficial-sigs.sh | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/clamav-unofficial-sigs.sh b/clamav-unofficial-sigs.sh
index 68516566..939eafc8 100644
--- a/clamav-unofficial-sigs.sh
+++ b/clamav-unofficial-sigs.sh
@@ -1075,7 +1075,6 @@ function output_signatures_triggered_during_ham_directory_scan() {
 # Adds a signature whitelist entry in the newer ClamAV IGN2 format
 function add_signature_whitelist_entry() { #signature
   xshok_pretty_echo_and_log "Signature Whitelist" "="
-
 	if [ -n "$1" ] ; then
 		input="$1"
 	else
@@ -1083,15 +1082,26 @@ function add_signature_whitelist_entry() { #signature
 		read -r input
 	fi
   if [ -n "$input" ] ; then
+		xshok_pretty_echo_and_log "Processing: ${input}"
     cd "$clam_dbs" || exit
 		# Remove quotes and .UNOFFICIAL from the string
 		input="$(echo "${input}" | tr -d "'" | tr -d '"' | tr -d '`"')"
 		input=${input/\.UNOFFICIAL/}
 
-    sig_full="$($grep_bin -H "$input" ./*.*db)"
-    sig_name="$(echo "$sig_full" | cut -d ":" -f 2 | cut -d "=" -f 1)"
+    sig_full="$($grep_bin -H -m 1 "$input" ./*.*db)"
+		sig_extension=${sig_full%%\:*}
+		sig_extension=${sig_extension##*\.}
+		shopt -s nocasematch
+		if [ "$sig_extension" == "hdb" ] || [ "$sig_extension" == "hsb" ] || [ "$sig_extension" == "hdu " ] || [ "$sig_extension" == "hsu" ] || [ "$sig_extension" == "mdb" ] || [ "$sig_extension" == "msb" ] || [ "$sig_extension" == "mdu" ] || [ "$sig_extension" == "msu" ] ; then
+			# Hash-based Signature Database
+			position="4"
+		else
+			position="2"
+		fi
+    sig_name="$(echo "$sig_full" | cut -d ":" -f $position | cut -d "=" -f 1)"
+
     if [ -n "$sig_name" ] ; then
-      if ! $grep_bin "$sig_name" my-whitelist.ign2 > /dev/null 2>&1 ; then
+      if ! $grep_bin -m 1 "$sig_name" my-whitelist.ign2 > /dev/null 2>&1 ; then
         cp -f -p my-whitelist.ign2 "$work_dir_work_configs" 2>/dev/null
         echo "$sig_name" >> "${work_dir_work_configs}/my-whitelist.ign2"
         echo "$sig_full" >> "${work_dir_work_configs}/tracker.txt"

From a5c7f0160dd03a66fc40b4783a4de4a28ff5c889 Mon Sep 17 00:00:00 2001
From: eXtremeSHOK <admin@extremeshok.com>
Date: Sun, 18 Aug 2019 05:20:18 +0200
Subject: [PATCH 25/45] set default options to allow for quicker setup

---
 config/user.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/user.conf b/config/user.conf
index c6e82e5a..8f7f51b9 100644
--- a/config/user.conf
+++ b/config/user.conf
@@ -30,7 +30,7 @@
 
 # Default dbs rating
 # valid rating: LOW, MEDIUM, HIGH
-#default_dbs_rating="MEDIUM"
+default_dbs_rating="MEDIUM"
 
 # Per Database
 # These ratings will override the global rating for the specific database
@@ -49,7 +49,7 @@
 #) #END ADDITIONAL DATABASES
 
 # Uncomment the following line to enable the script
-#user_configuration_complete="yes"
+user_configuration_complete="yes"
 
 # Proxy Support
 # If necessary to proxy database downloads, define the rsync, curl, wget, dig, hosr proxy settings here.

From c3ddf75b5aef9f2d59d77125084734cd322c8f11 Mon Sep 17 00:00:00 2001
From: eXtremeSHOK <admin@extremeshok.com>
Date: Sun, 18 Aug 2019 05:37:06 +0200
Subject: [PATCH 26/45] support for os.*.conf

---
 clamav-unofficial-sigs.sh | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/clamav-unofficial-sigs.sh b/clamav-unofficial-sigs.sh
index 939eafc8..cd363fdf 100644
--- a/clamav-unofficial-sigs.sh
+++ b/clamav-unofficial-sigs.sh
@@ -1357,7 +1357,7 @@ ${ofs} -t, --test-database ${ofe} Clamscan integrity test a specific database fi
 ${ofb}
 ${ofs} -o, --output-triggered ${ofe} If HAM directory scanning is enabled in the script's ${oft} configuration file, then output names of any third-party ${oft} signatures that triggered during the HAM directory scan
 ${ofb}
-${ofs} -w, --whitelist ${ofe} Adds a signature whitelist entry in the newer ClamAV IGN2 ${oft} format to 'my-whitelist.ign2' in order to temporarily resolve ${oft} a false-positive issue with a specific third-party signature. ${oft} Script added whitelist entries will automatically be removed ${oft} if the original signature is either modified or removed from ${oft} the third-party signature database
+${ofs} -w, --whitelist <signature-name> ${ofe} Adds a signature whitelist entry in the newer ClamAV IGN2 ${oft} format to 'my-whitelist.ign2' in order to temporarily resolve ${oft} a false-positive issue with a specific third-party signature. ${oft} Script added whitelist entries will automatically be removed ${oft} if the original signature is either modified or removed from ${oft} the third-party signature database
 ${ofb}
 ${ofs} --check-clamav ${ofe} If ClamD status check is enabled and the socket path is correctly ${oft} specifiedthen test to see if clamd is running or not
 ${ofb}
@@ -1411,7 +1411,19 @@ else
   exit 1
 fi
 # Default config files
-config_files=( "${config_dir}/master.conf" "${config_dir}/os.conf" "${config_dir}/user.conf" )
+config_files=()
+if [ -r "${config_dir}/master.conf" ] ; then
+	config_files+=( "${config_dir}/master.conf" )
+fi
+#find the a suitable os.conf or os.*.conf file
+config_file="$(find "$config_dir" -type f -iname "os.conf" -o -iname "os.*.conf" | tail -n1)"
+if [ -r "${config_dir}/${config_file}" ] && [ "$config_file" != "" ]; then
+	config_files+=( "${config_dir}/${config_file}" )
+fi
+if [ -r "${config_dir}/user.conf" ] ; then
+	config_files+=( "${config_dir}/user.conf" )
+fi
+
 
 # Initialise
 config_version="0"
@@ -1546,6 +1558,8 @@ if [ "$custom_config" != "no" ] ; then
 		config_files=()
 		if [ -r "${config_dir}/master.conf" ] ; then
 			config_files+=( "${config_dir}/master.conf" )
+		else
+			xshok_pretty_echo_and_log "WARNING: ${config_dir}/master.conf not found"
 		fi
 		#find the a suitable os.conf or os.*.conf file
 		config_file="$(find "$config_dir" -type f -iname "os.conf" -o -iname "os.*.conf" | tail -n1)"
@@ -1556,6 +1570,8 @@ if [ "$custom_config" != "no" ] ; then
 		fi
 		if [ -r "${config_dir}/user.conf" ] ; then
 			config_files+=( "${config_dir}/user.conf" )
+		else
+			xshok_pretty_echo_and_log "WARNING: ${config_dir}/user.conf not found"
 		fi
   else
     config_files=( "$custom_config" )

From fec7616cc3d8872801c5cb7be1ac4da6d0997d3e Mon Sep 17 00:00:00 2001
From: eXtremeSHOK <admin@extremeshok.com>
Date: Sun, 18 Aug 2019 05:48:30 +0200
Subject: [PATCH 27/45] fix config file loading

---
 clamav-unofficial-sigs.sh | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/clamav-unofficial-sigs.sh b/clamav-unofficial-sigs.sh
index cd363fdf..92a704a5 100644
--- a/clamav-unofficial-sigs.sh
+++ b/clamav-unofficial-sigs.sh
@@ -1411,14 +1411,11 @@ else
   exit 1
 fi
 # Default config files
-config_files=()
-if [ -r "${config_dir}/master.conf" ] ; then
-	config_files+=( "${config_dir}/master.conf" )
-fi
+config_files=("${config_dir}/master.conf")
 #find the a suitable os.conf or os.*.conf file
 config_file="$(find "$config_dir" -type f -iname "os.conf" -o -iname "os.*.conf" | tail -n1)"
-if [ -r "${config_dir}/${config_file}" ] && [ "$config_file" != "" ]; then
-	config_files+=( "${config_dir}/${config_file}" )
+if [ -r "${config_file}" ]; then
+	config_files+=( "${config_file}" )
 fi
 if [ -r "${config_dir}/user.conf" ] ; then
 	config_files+=( "${config_dir}/user.conf" )
@@ -1563,8 +1560,8 @@ if [ "$custom_config" != "no" ] ; then
 		fi
 		#find the a suitable os.conf or os.*.conf file
 		config_file="$(find "$config_dir" -type f -iname "os.conf" -o -iname "os.*.conf" | tail -n1)"
-		if [ -r "${config_dir}/${config_file}" ] && [ "$config_file" != "" ]; then
-			config_files+=( "${config_dir}/${config_file}" )
+		if [ -r "${config_file}" ] ; then
+			config_files+=( "${config_file}" )
 		else
 			xshok_pretty_echo_and_log "WARNING: ${config_dir}/os.conf not found"
 		fi

From 14e31ad0b0145d2e16a3536d5058919d55f1ea1d Mon Sep 17 00:00:00 2001
From: eXtremeSHOK <admin@extremeshok.com>
Date: Sun, 18 Aug 2019 06:21:35 +0200
Subject: [PATCH 28/45] fix centos7 support centos7 clamav install guide

---
 config/os.centos7.conf |  2 +-
 guides/centos7.md      | 64 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 65 insertions(+), 1 deletion(-)
 create mode 100644 guides/centos7.md

diff --git a/config/os.centos7.conf b/config/os.centos7.conf
index 4f395b1d..458ac866 100644
--- a/config/os.centos7.conf
+++ b/config/os.centos7.conf
@@ -27,7 +27,7 @@ clam_dbs="/var/lib/clamav"
 
 clamd_pid="/var/run/clamd.scan/clamd.pid"
 
-clamd_restart_opt="systemctl restart clamd.scan"
+clamd_restart_opt="systemctl restart clamd@scan"
 
 #clamd_socket="/var/run/clamd.scan/clamd.sock"
 
diff --git a/guides/centos7.md b/guides/centos7.md
new file mode 100644
index 00000000..6cd81ddb
--- /dev/null
+++ b/guides/centos7.md
@@ -0,0 +1,64 @@
+#### Basic guide to Installing on CentOS 7
+
+## Install Requirements
+# Step 1 Install epel
+```
+yum -y update
+yum -y install epel-release
+yum -y update
+yum clean all
+```
+
+# Step 2 Install clamav
+```
+yum -y install clamav-server clamav-data clamav-update clamav-filesystem clamav clamav-scanner-systemd clamav-devel clamav-lib clamav-server-systemd
+```
+
+# Step 3 Configure SELinux to allow clamav
+```
+setsebool -P antivirus_can_scan_system 1
+setsebool -P clamd_use_jit 1
+```
+
+# Step 4 Configure clamav
+```
+sed -i '/^Example$/d' /etc/freshclam.conf
+sed -i '/^Example$/d' /etc/clamd.d/scan.conf
+sed -i -e 's/#LocalSocket \/var\/run\/clamd.scan\/clamd.sock/LocalSocket \/var\/run\/clamd.scan\/clamd.sock/g' /etc/clamd.d/scan.conf
+sed -i '/REMOVE ME/d' /etc/sysconfig/freshclam
+systemctl enable clamd@scan
+freshclam
+systemctl start clamd@scan
+systemctl status clamd@scan
+```
+
+# Step 5 Install Dependencies
+```
+yum -y install bind-utils rsync
+```
+# Step 6
+```
+curl https://raw.githubusercontent.com/extremeshok/clamav-unofficial-sigs/master/clamav-unofficial-sigs.sh --output /usr/local/bin/clamav-unofficial-sigs.sh
+chmod 777 /usr/local/bin/clamav-unofficial-sigs.sh
+mkdir -p /etc/clamav-unofficial-sigs
+curl https://raw.githubusercontent.com/extremeshok/clamav-unofficial-sigs/master/config/master.conf --output /etc/clamav-unofficial-sigs/master.conf
+curl https://raw.githubusercontent.com/extremeshok/clamav-unofficial-sigs/master/config/os.centos7.conf --output /etc/clamav-unofficial-sigs/os.centos7.conf
+curl https://raw.githubusercontent.com/extremeshok/clamav-unofficial-sigs/master/config/user.conf --output /etc/clamav-unofficial-sigs/user.conf
+```
+
+# Step 7
+set your user options
+```
+vim /etc/clamav-unofficial-sigs/user.conf
+```
+
+# Step 9
+run once to make sure there are no errors
+```
+bash clamav-unofficial-sigs.sh
+```
+
+# Step 10
+```
+bash clamav-unofficial-sigs.sh --install-all
+```

From 541352348d7db9e5466cc4fb26755fe18c38361f Mon Sep 17 00:00:00 2001
From: eXtremeSHOK <admin@extremeshok.com>
Date: Sun, 18 Aug 2019 06:24:41 +0200
Subject: [PATCH 29/45] bug fix: reload after whitelisting

---
 clamav-unofficial-sigs.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/clamav-unofficial-sigs.sh b/clamav-unofficial-sigs.sh
index 92a704a5..a9b75538 100644
--- a/clamav-unofficial-sigs.sh
+++ b/clamav-unofficial-sigs.sh
@@ -1118,6 +1118,7 @@ function add_signature_whitelist_entry() { #signature
             if [ "$selinux_fixes" == "yes" ] ; then
               restorecon "${clam_dbs}/local.ign"
             fi
+						do_clamd_reload="4"
             clamscan_reload_dbs
 
             xshok_pretty_echo_and_log "Signature '${input}' has been added to my-whitelist.ign2 and"

From e1ab47f73a01c55bbc16462ef9c08cf10c169977 Mon Sep 17 00:00:00 2001
From: eXtremeSHOK <admin@extremeshok.com>
Date: Sun, 18 Aug 2019 06:30:19 +0200
Subject: [PATCH 30/45] default sanesecurity and linuxmalwaredetect to enabled

---
 config/user.conf | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/config/user.conf b/config/user.conf
index 8f7f51b9..b32f86c3 100644
--- a/config/user.conf
+++ b/config/user.conf
@@ -28,6 +28,10 @@
 
 #securiteinfo_authorisation_signature="YOUR-SIGNATURE-NUMBER"
 
+sanesecurity_enabled="yes"
+
+linuxmalwaredetect_enabled="yes"
+
 # Default dbs rating
 # valid rating: LOW, MEDIUM, HIGH
 default_dbs_rating="MEDIUM"

From 5f8668dcb17f3122dea9ff5b9e376f2163f5d73c Mon Sep 17 00:00:00 2001
From: eXtremeSHOK <admin@extremeshok.com>
Date: Sun, 18 Aug 2019 06:46:34 +0200
Subject: [PATCH 31/45] increase retries to 5

---
 config/master.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/master.conf b/config/master.conf
index 2b83512f..0eacd6c5 100644
--- a/config/master.conf
+++ b/config/master.conf
@@ -448,7 +448,7 @@ downloader_connect_timeout="60"
 downloader_max_time="600"
 
 # Set downloader retry count for failed transfers
-downloader_tries="3"
+downloader_tries="5"
 
 # Set working directory paths (edit to meet your own needs). If these
 # directories do not exist, the script will attempt to create them.

From e1e123241e94015cf259faa74ef117a549ad0c33 Mon Sep 17 00:00:00 2001
From: eXtremeSHOK <admin@extremeshok.com>
Date: Sun, 18 Aug 2019 14:48:17 +0200
Subject: [PATCH 32/45] updates to cron

---
 clamav-unofficial-sigs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/clamav-unofficial-sigs.sh b/clamav-unofficial-sigs.sh
index a9b75538..81fa3ebd 100644
--- a/clamav-unofficial-sigs.sh
+++ b/clamav-unofficial-sigs.sh
@@ -698,7 +698,7 @@ function install_cron() {
 # 60 - 600 seconds.  To Adjust the cron values, edit your configs and run
 # bash clamav-unofficial-sigs.sh --install-cron to generate a new file.
 MAILTO=root
-$cron_minute * * * * ${cron_sudo} ${cron_user} [ -x ${cron_script_full_path} ] && ${cron_bash} ${cron_script_full_path} > /dev/null
+$cron_minute * * * * ${cron_sudo} ${cron_user} [ -x ${cron_script_full_path} ] && ${cron_bash} ${cron_script_full_path}
 
 # https://eXtremeSHOK.com ######################################################
 

From 2a64ded4f7938ad2a06842535acf5857b5b92241 Mon Sep 17 00:00:00 2001
From: eXtremeSHOK <admin@extremeshok.com>
Date: Sun, 18 Aug 2019 14:48:31 +0200
Subject: [PATCH 33/45] some notes

---
 guides/macosx.md | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/guides/macosx.md b/guides/macosx.md
index 43fb18c2..389386bd 100644
--- a/guides/macosx.md
+++ b/guides/macosx.md
@@ -1,14 +1,17 @@
 #### Basic guide to Installing on Mac OS 10.12+ and OS X
+Press Command+Space and type Terminal and press enter/return key.
+Run all the following in the Terminal app:
+
+## Notes:
+https://www.clamav.net/documents/installation-on-macos-mac-os-x
 
 ## Install Requirements
 # Step 1 Install Homebrew
-Press Command+Space and type Terminal and press enter/return key.
-Run in Terminal app:
 ```
-ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" < /dev/null 2> /dev/null
+/usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
 ```
 
-# Step 2
+# Step 2 Install clamav
 ```
 brew install clamav
 ```

From 1d1a4e5e950128f8617ae5dbcef7d5da88f9d03c Mon Sep 17 00:00:00 2001
From: eXtremeSHOK <admin@extremeshok.com>
Date: Mon, 19 Aug 2019 17:42:34 +0200
Subject: [PATCH 34/45] consitency

---
 clamav-unofficial-sigs.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/clamav-unofficial-sigs.sh b/clamav-unofficial-sigs.sh
index 81fa3ebd..c6b25999 100644
--- a/clamav-unofficial-sigs.sh
+++ b/clamav-unofficial-sigs.sh
@@ -231,13 +231,13 @@ function xshok_pretty_echo_and_log() { # "string" "repeating" "count" "type"
 	# always show errors and alerts
 	if [ -z "$mytype" ] ; then
 		shopt -s nocasematch
-		if [[ "$mystring" =~ "error:" ]] || [[ "$mystring" =~ "error " ]] ; then
+		if [[ "$mystring" =~ "ERROR:" ]] || [[ "$mystring" =~ "ERROR " ]] ; then
 			mytype="e"
-		elif [[ "$mystring" =~ "warning:" ]] || [[ "$mystring" =~ "warning " ]] ; then
+		elif [[ "$mystring" =~ "WARNING:" ]] || [[ "$mystring" =~ "WARNING " ]] ; then
 			mytype="w"
-		elif [[ "$mystring" =~ "alert:" ]] || [[ "$mystring" =~ "alert " ]] ; then
+		elif [[ "$mystring" =~ "ALERT:" ]] || [[ "$mystring" =~ "ALERT " ]] ; then
 			mytype="a"
-		elif [[ "$mystring" =~ "notice:" ]] || [[ "$mystring" =~ "notice " ]] ; then
+		elif [[ "$mystring" =~ "NOTICES:" ]] || [[ "$mystring" =~ "NOTICES " ]] ; then
 			mytype="n"
 		fi
 	fi
@@ -286,7 +286,7 @@ function xshok_pretty_echo_and_log() { # "string" "repeating" "count" "type"
         perms chown -f "${clam_user}:${clam_group}" "${log_file_path}/${log_file_name}"
       fi
       if [ ! -w "${log_file_path}/${log_file_name}" ] ; then
-        echo "Warning: Logging Disabled, as file not writable: ${log_file_path}/${log_file_name}"
+        echo "WARNING: Logging Disabled, as file not writable: ${log_file_path}/${log_file_name}"
         enable_log="no"
       else
         echo "$(date "+%b %d %T")" "${1}" >> "${log_file_path}/${log_file_name}"

From 182024ba4138fe5ae4a0474729a2d205b5566905 Mon Sep 17 00:00:00 2001
From: eXtremeSHOK <admin@extremeshok.com>
Date: Mon, 19 Aug 2019 17:43:03 +0200
Subject: [PATCH 35/45] clamupdate has no permissions to run service restarts
 fixes #186

---
 config/os.centos7.conf | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/config/os.centos7.conf b/config/os.centos7.conf
index 458ac866..60aed1bb 100644
--- a/config/os.centos7.conf
+++ b/config/os.centos7.conf
@@ -20,7 +20,7 @@
 
 # RHEL/CentOS 7, using ClamAV packages from EPEL
 
-clam_user="clamupdate"
+clam_user="clamscan"
 clam_group="clamupdate"
 
 clam_dbs="/var/lib/clamav"
@@ -33,4 +33,7 @@ clamd_restart_opt="systemctl restart clamd@scan"
 
 clamd_reload_opt="clamdscan --config-file=/etc/clamd.d/scan.conf --reload"
 
+# By default clamupdate has no permissions to run service restarts
+reload_dbs="no"
+
 # https://eXtremeSHOK.com ######################################################

From 0fe825263e9d7f44c5098ab253f8fdcf3dbd8cbf Mon Sep 17 00:00:00 2001
From: eXtremeSHOK <admin@extremeshok.com>
Date: Mon, 19 Aug 2019 18:05:22 +0200
Subject: [PATCH 36/45] prepare for 6.1.0

---
 README.md                 | 20 ++++++++++++++++++++
 clamav-unofficial-sigs.sh |  4 ++--
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index b1804300..ba7fce8e 100644
--- a/README.md
+++ b/README.md
@@ -167,6 +167,26 @@ Usage: clamav-unofficial-sigs.sh [OPTION] [PATH|FILE]
         its associated files and databases from the system      
 
 ## Change Log
+### Version 6.1.0 (Updated XX August 2019)
+ - eXtremeSHOK.com Maintenance
+ - Sanitize whitelist input string (Remove quotes and .UNOFFICIAL)
+ - --fail added to curl commands
+ - Silence output when run under cron
+ - Fix: Missing logic for LOWMEDIUMONLY | MEDIUMHIGHONLY | HIGHONLY databases
+ - Support for os.<osname>.conf and os.config_file
+ - Where possible replaced echo with xshok_pretty_echo_and_log
+ - Refactor xshok_pretty_echo_and_log and make all notices styles consistent
+ - add MAILTO=root to the cron file
+ - Add full proxy support for wget, curl, rsync, dig, host
+ - Better support for proxy config variables
+ - New config variable: git_branch (defaults to master for the update checks)
+ - allow -w <signature> for quicker whitelisting
+ - Added Full support for Hash-based Signature Databases
+ - User.conf is pre-configured with default options to allow for quicker setup
+ - Default sanesecurity and linuxmalwaredetect to enabled
+ - Increase default retries from 3 to 5
+ - Incremented the config to version 76
+
 ### Version 6.0.1 (Updated 30 July 2019)
  - eXtremeSHOK.com Maintenance
  - Fix logging @dominicraf
diff --git a/clamav-unofficial-sigs.sh b/clamav-unofficial-sigs.sh
index c6b25999..94612a81 100644
--- a/clamav-unofficial-sigs.sh
+++ b/clamav-unofficial-sigs.sh
@@ -1385,8 +1385,8 @@ EOF
 ################################################################################
 
 # Script Info
-script_version="6.0.2"
-script_version_date="2019-08-18"
+script_version="6.1.0"
+script_version_date="2019-08-XX"
 minimum_required_config_version="76"
 minimum_yara_clamav_version="0.99"
 

From 1ff6f8447184f66c7ee6e30a514fb9c43c407372 Mon Sep 17 00:00:00 2001
From: eXtremeSHOK <admin@extremeshok.com>
Date: Tue, 20 Aug 2019 00:27:09 +0200
Subject: [PATCH 37/45] correct user and group

---
 config/os.centos7.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/os.centos7.conf b/config/os.centos7.conf
index 60aed1bb..ed60850e 100644
--- a/config/os.centos7.conf
+++ b/config/os.centos7.conf
@@ -20,7 +20,7 @@
 
 # RHEL/CentOS 7, using ClamAV packages from EPEL
 
-clam_user="clamscan"
+clam_user="clamupdate"
 clam_group="clamupdate"
 
 clam_dbs="/var/lib/clamav"

From d6c5e7d276d1c6a85b6753eaab9535ded7373a61 Mon Sep 17 00:00:00 2001
From: eXtremeSHOK <admin@extremeshok.com>
Date: Tue, 20 Aug 2019 00:32:22 +0200
Subject: [PATCH 38/45] update

---
 README.md | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index ba7fce8e..07826618 100644
--- a/README.md
+++ b/README.md
@@ -169,18 +169,19 @@ Usage: clamav-unofficial-sigs.sh [OPTION] [PATH|FILE]
 ## Change Log
 ### Version 6.1.0 (Updated XX August 2019)
  - eXtremeSHOK.com Maintenance
- - Sanitize whitelist input string (Remove quotes and .UNOFFICIAL)
- - --fail added to curl commands
- - Silence output when run under cron
+ - Thanks Reio Remma & Oliver Nissen
+ - fail added to all curl commands
  - Fix: Missing logic for LOWMEDIUMONLY | MEDIUMHIGHONLY | HIGHONLY databases
- - Support for os.<osname>.conf and os.config_file
+ - Support for either os.osname.conf or os.conf files (no more needing to rename the os.osname.conf to os.conf)
  - Where possible replaced echo with xshok_pretty_echo_and_log
  - Refactor xshok_pretty_echo_and_log and make all notices styles consistent
- - add MAILTO=root to the cron file
+ - Silence output when run under cron
+ - add MAILTO=root to the generated cron file
  - Add full proxy support for wget, curl, rsync, dig, host
  - Better support for proxy config variables
  - New config variable: git_branch (defaults to master for the update checks)
- - allow -w <signature> for quicker whitelisting
+ - allow -w signature for quicker whitelisting
+ - Sanitize whitelist input string (Remove quotes and .UNOFFICIAL)
  - Added Full support for Hash-based Signature Databases
  - User.conf is pre-configured with default options to allow for quicker setup
  - Default sanesecurity and linuxmalwaredetect to enabled

From b8d9ef83acf7bfbc089e71d2c8334401f7a5fdfc Mon Sep 17 00:00:00 2001
From: eXtremeSHOK <admin@extremeshok.com>
Date: Tue, 20 Aug 2019 13:08:52 +0200
Subject: [PATCH 39/45] fixes #237

---
 config/master.conf | 2 +-
 config/user.conf   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/master.conf b/config/master.conf
index 0eacd6c5..59e6a9aa 100644
--- a/config/master.conf
+++ b/config/master.conf
@@ -486,7 +486,7 @@ selinux_fixes="no" # Default is "no" ignore ssl errors and warnings
 # If necessary to proxy database downloads, define the rsync, curl, wget, dig, hosr proxy settings here.
 #rsync_proxy="username:password@proxy_host:proxy_port"
 #curl_proxy="--proxy http://username:password@proxy_host:proxy_port"
-#wget_proxy"-e http_proxy=http://username:password@proxy_host:proxy_port -e https_proxy=https://username:password@proxy_host:proxy_port"
+#wget_proxy="-e http_proxy=http://username:password@proxy_host:proxy_port -e https_proxy=https://username:password@proxy_host:proxy_port"
 #dig_proxy="@proxy_host -p proxy_host:proxy_port"
 #host_proxy="@proxy_host" #does not support port
 
diff --git a/config/user.conf b/config/user.conf
index b32f86c3..eeb193c4 100644
--- a/config/user.conf
+++ b/config/user.conf
@@ -59,7 +59,7 @@ user_configuration_complete="yes"
 # If necessary to proxy database downloads, define the rsync, curl, wget, dig, hosr proxy settings here.
 #rsync_proxy="username:password@proxy_host:proxy_port"
 #curl_proxy="--proxy http://username:password@proxy_host:proxy_port"
-#wget_proxy"-e http_proxy=http://username:password@proxy_host:proxy_port -e https_proxy=https://username:password@proxy_host:proxy_port"
+#wget_proxy="-e http_proxy=http://username:password@proxy_host:proxy_port -e https_proxy=https://username:password@proxy_host:proxy_port"
 #dig_proxy="@proxy_host -p proxy_host:proxy_port"
 #host_proxy="@proxy_host" #does not support port
 

From 11afc6ea8a1e2a9c4d22b82a4f6d449057bf9560 Mon Sep 17 00:00:00 2001
From: eXtremeSHOK <admin@extremeshok.com>
Date: Tue, 27 Aug 2019 00:11:47 +0200
Subject: [PATCH 40/45] better update comparison fixes #238

---
 clamav-unofficial-sigs.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/clamav-unofficial-sigs.sh b/clamav-unofficial-sigs.sh
index 94612a81..945b4782 100644
--- a/clamav-unofficial-sigs.sh
+++ b/clamav-unofficial-sigs.sh
@@ -1279,7 +1279,7 @@ function check_new_version() {
     latest_version="$($curl_bin --compress $curl_proxy $curl_insecure $curl_output_level --connect-timeout "${downloader_connect_timeout}" --remote-time --location --retry "${downloader_tries}" --max-time "${downloader_max_time}" "https://raw.githubusercontent.com/extremeshok/clamav-unofficial-sigs/${git_branch}/clamav-unofficial-sigs.sh" 2> /dev/null | $grep_bin "^script_version=" | head -n1 | cut -d '"' -f 2)"
   fi
   if [ "$latest_version" ] ; then
-    if [ "$latest_version" != "$script_version" ] ; then
+		if [ "$(printf "%02d%02d%02d%02d" ${latest_version//./ })" -gt "$(printf "%02d%02d%02d%02d" ${script_version//./ })" ] ; then
       xshok_pretty_echo_and_log "ALERT: New version : v${latest_version} @ https://github.com/extremeshok/clamav-unofficial-sigs"
     fi
   fi
@@ -1295,7 +1295,7 @@ function check_new_config_version() {
     latest_config_version="$($curl_bin --compress $curl_proxy $curl_insecure $curl_output_level --connect-timeout "${downloader_connect_timeout}" --remote-time --location --retry "${downloader_tries}" --max-time "${downloader_max_time}" "https://raw.githubusercontent.com/extremeshok/clamav-unofficial-sigs/${git_branch}/config/master.conf" 2> /dev/null | $grep_bin "^config_version=" | head -n1 | cut -d '"' -f 2)"
   fi
   if [ "$latest_config_version" ] ; then
-    if [ "$latest_config_version" != "$config_version" ] ; then
+		if [ "$(printf "%02d%02d%02d%02d" ${latest_config_version//./ })" -gt "$(printf "%02d%02d%02d%02d" ${config_version//./ })" ] ; then
       xshok_pretty_echo_and_log "ALERT: New configversion : v${latest_config_version} @ https://github.com/extremeshok/clamav-unofficial-sigs"
     fi
   fi

From abf3f87a97619d178a85739f102341b8dbc2611c Mon Sep 17 00:00:00 2001
From: eXtremeSHOK <admin@extremeshok.com>
Date: Tue, 27 Aug 2019 00:16:21 +0200
Subject: [PATCH 41/45] Fix log permissions to prevent cron errors fixes #186

---
 clamav-unofficial-sigs.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/clamav-unofficial-sigs.sh b/clamav-unofficial-sigs.sh
index 945b4782..fe998785 100644
--- a/clamav-unofficial-sigs.sh
+++ b/clamav-unofficial-sigs.sh
@@ -3323,5 +3323,12 @@ check_new_config_version
 
 xshok_cleanup
 
+# Set the permission of the log file, to fix any permission errors, this is done to fix cron errors after running the script as root.
+if [ "$enable_log" == "yes" ] ; then
+	if [ -w "${log_file_path}/${log_file_name}" ] ; then
+		perms chown -f "${clam_user}:${clam_group}" "${log_file_path}/${log_file_name}"
+	fi
+fi
+
 # And lastly we exit, Note: the exit is always on the 2nd last line
 exit $?

From bf4823cb1c5789a4de674bf3cedacc101d8852ef Mon Sep 17 00:00:00 2001
From: eXtremeSHOK <admin@extremeshok.com>
Date: Tue, 27 Aug 2019 00:21:15 +0200
Subject: [PATCH 42/45] happy shellcheck

---
 clamav-unofficial-sigs.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/clamav-unofficial-sigs.sh b/clamav-unofficial-sigs.sh
index fe998785..28d37f98 100644
--- a/clamav-unofficial-sigs.sh
+++ b/clamav-unofficial-sigs.sh
@@ -1279,6 +1279,7 @@ function check_new_version() {
     latest_version="$($curl_bin --compress $curl_proxy $curl_insecure $curl_output_level --connect-timeout "${downloader_connect_timeout}" --remote-time --location --retry "${downloader_tries}" --max-time "${downloader_max_time}" "https://raw.githubusercontent.com/extremeshok/clamav-unofficial-sigs/${git_branch}/clamav-unofficial-sigs.sh" 2> /dev/null | $grep_bin "^script_version=" | head -n1 | cut -d '"' -f 2)"
   fi
   if [ "$latest_version" ] ; then
+# shellcheck disable=SC2183,SC2183
 		if [ "$(printf "%02d%02d%02d%02d" ${latest_version//./ })" -gt "$(printf "%02d%02d%02d%02d" ${script_version//./ })" ] ; then
       xshok_pretty_echo_and_log "ALERT: New version : v${latest_version} @ https://github.com/extremeshok/clamav-unofficial-sigs"
     fi
@@ -1295,6 +1296,7 @@ function check_new_config_version() {
     latest_config_version="$($curl_bin --compress $curl_proxy $curl_insecure $curl_output_level --connect-timeout "${downloader_connect_timeout}" --remote-time --location --retry "${downloader_tries}" --max-time "${downloader_max_time}" "https://raw.githubusercontent.com/extremeshok/clamav-unofficial-sigs/${git_branch}/config/master.conf" 2> /dev/null | $grep_bin "^config_version=" | head -n1 | cut -d '"' -f 2)"
   fi
   if [ "$latest_config_version" ] ; then
+# shellcheck disable=SC2183,SC2183
 		if [ "$(printf "%02d%02d%02d%02d" ${latest_config_version//./ })" -gt "$(printf "%02d%02d%02d%02d" ${config_version//./ })" ] ; then
       xshok_pretty_echo_and_log "ALERT: New configversion : v${latest_config_version} @ https://github.com/extremeshok/clamav-unofficial-sigs"
     fi

From 0db5165e3382f8d8bf97e56812e913c1a3348d29 Mon Sep 17 00:00:00 2001
From: eXtremeSHOK <admin@extremeshok.com>
Date: Tue, 27 Aug 2019 00:24:32 +0200
Subject: [PATCH 43/45] different shellcheck disable format

---
 clamav-unofficial-sigs.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/clamav-unofficial-sigs.sh b/clamav-unofficial-sigs.sh
index 28d37f98..cfe14d36 100644
--- a/clamav-unofficial-sigs.sh
+++ b/clamav-unofficial-sigs.sh
@@ -1279,7 +1279,7 @@ function check_new_version() {
     latest_version="$($curl_bin --compress $curl_proxy $curl_insecure $curl_output_level --connect-timeout "${downloader_connect_timeout}" --remote-time --location --retry "${downloader_tries}" --max-time "${downloader_max_time}" "https://raw.githubusercontent.com/extremeshok/clamav-unofficial-sigs/${git_branch}/clamav-unofficial-sigs.sh" 2> /dev/null | $grep_bin "^script_version=" | head -n1 | cut -d '"' -f 2)"
   fi
   if [ "$latest_version" ] ; then
-# shellcheck disable=SC2183,SC2183
+# shellcheck disable=SC2183,SC2086
 		if [ "$(printf "%02d%02d%02d%02d" ${latest_version//./ })" -gt "$(printf "%02d%02d%02d%02d" ${script_version//./ })" ] ; then
       xshok_pretty_echo_and_log "ALERT: New version : v${latest_version} @ https://github.com/extremeshok/clamav-unofficial-sigs"
     fi
@@ -1296,7 +1296,7 @@ function check_new_config_version() {
     latest_config_version="$($curl_bin --compress $curl_proxy $curl_insecure $curl_output_level --connect-timeout "${downloader_connect_timeout}" --remote-time --location --retry "${downloader_tries}" --max-time "${downloader_max_time}" "https://raw.githubusercontent.com/extremeshok/clamav-unofficial-sigs/${git_branch}/config/master.conf" 2> /dev/null | $grep_bin "^config_version=" | head -n1 | cut -d '"' -f 2)"
   fi
   if [ "$latest_config_version" ] ; then
-# shellcheck disable=SC2183,SC2183
+# shellcheck disable=SC2183,SC2086
 		if [ "$(printf "%02d%02d%02d%02d" ${latest_config_version//./ })" -gt "$(printf "%02d%02d%02d%02d" ${config_version//./ })" ] ; then
       xshok_pretty_echo_and_log "ALERT: New configversion : v${latest_config_version} @ https://github.com/extremeshok/clamav-unofficial-sigs"
     fi

From bcda7a9c16b92b9af83868243b80ebb211344f27 Mon Sep 17 00:00:00 2001
From: eXtremeSHOK <admin@extremeshok.com>
Date: Tue, 27 Aug 2019 00:45:35 +0200
Subject: [PATCH 44/45] 6.1.0

---
 README.md                 | 4 +++-
 clamav-unofficial-sigs.sh | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 07826618..d28fee29 100644
--- a/README.md
+++ b/README.md
@@ -167,7 +167,7 @@ Usage: clamav-unofficial-sigs.sh [OPTION] [PATH|FILE]
         its associated files and databases from the system      
 
 ## Change Log
-### Version 6.1.0 (Updated XX August 2019)
+### Version 6.1.0 (Updated 27 August 2019)
  - eXtremeSHOK.com Maintenance
  - Thanks Reio Remma & Oliver Nissen
  - fail added to all curl commands
@@ -186,6 +186,8 @@ Usage: clamav-unofficial-sigs.sh [OPTION] [PATH|FILE]
  - User.conf is pre-configured with default options to allow for quicker setup
  - Default sanesecurity and linuxmalwaredetect to enabled
  - Increase default retries from 3 to 5
+ - Ensure log file permissions are correct
+ - Better update comparison check, only notify if newer
  - Incremented the config to version 76
 
 ### Version 6.0.1 (Updated 30 July 2019)
diff --git a/clamav-unofficial-sigs.sh b/clamav-unofficial-sigs.sh
index cfe14d36..f013aa3f 100644
--- a/clamav-unofficial-sigs.sh
+++ b/clamav-unofficial-sigs.sh
@@ -1298,7 +1298,7 @@ function check_new_config_version() {
   if [ "$latest_config_version" ] ; then
 # shellcheck disable=SC2183,SC2086
 		if [ "$(printf "%02d%02d%02d%02d" ${latest_config_version//./ })" -gt "$(printf "%02d%02d%02d%02d" ${config_version//./ })" ] ; then
-      xshok_pretty_echo_and_log "ALERT: New configversion : v${latest_config_version} @ https://github.com/extremeshok/clamav-unofficial-sigs"
+      xshok_pretty_echo_and_log "ALERT: New config version : v${latest_config_version} @ https://github.com/extremeshok/clamav-unofficial-sigs"
     fi
   fi
 }
@@ -1388,7 +1388,7 @@ EOF
 
 # Script Info
 script_version="6.1.0"
-script_version_date="2019-08-XX"
+script_version_date="2019-08-27"
 minimum_required_config_version="76"
 minimum_yara_clamav_version="0.99"
 

From 70b356533349a4c3da643e7bcc2f2522eff41f4b Mon Sep 17 00:00:00 2001
From: eXtremeSHOK <admin@extremeshok.com>
Date: Tue, 27 Aug 2019 17:00:04 +0200
Subject: [PATCH 45/45] 755 not 777 fixes #240

---
 guides/centos7.md | 83 +++++++++++++++++++++++++++++++++++++++++------
 guides/macosx.md  |  2 +-
 guides/pfsense.md |  4 +--
 3 files changed, 76 insertions(+), 13 deletions(-)

diff --git a/guides/centos7.md b/guides/centos7.md
index 6cd81ddb..929f8700 100644
--- a/guides/centos7.md
+++ b/guides/centos7.md
@@ -1,3 +1,5 @@
+# WORK IN PROGRESS
+
 #### Basic guide to Installing on CentOS 7
 
 ## Install Requirements
@@ -6,7 +8,6 @@
 yum -y update
 yum -y install epel-release
 yum -y update
-yum clean all
 ```
 
 # Step 2 Install clamav
@@ -22,43 +23,105 @@ setsebool -P clamd_use_jit 1
 
 # Step 4 Configure clamav
 ```
-sed -i '/^Example$/d' /etc/freshclam.conf
 sed -i '/^Example$/d' /etc/clamd.d/scan.conf
-sed -i -e 's/#LocalSocket \/var\/run\/clamd.scan\/clamd.sock/LocalSocket \/var\/run\/clamd.scan\/clamd.sock/g' /etc/clamd.d/scan.conf
+sed -i -e 's|#LocalSocket /var/run/clamd.scan/clamd.sock|LocalSocket /var/run/clamd.scan/clamd.sock/g' /etc/clamd.d/scan.conf
+
+
+cat << EOF > /etc/tmpfiles.d/clamav.conf
+/var/run/clamd.scan 0755 clam clam
+EOF
+
+mv /usr/lib/systemd/system/clamd\@scan.service /usr/lib/systemd/system/clamd\@scan.old
+cat << EOF > /usr/lib/systemd/system/clamd\@scan.service
+# Run the clamd scanner
+[Unit]
+Description = clamd scanner (%i) daemon
+After = syslog.target nss-lookup.target network.target
+
+[Service]
+Type = simple
+ExecStart = /usr/sbin/clamd --foreground=yes
+Restart = on-failure
+IOSchedulingPriority = 7
+CPUSchedulingPolicy = 5
+Nice = 19
+PrivateTmp = true
+MemoryLimit=500M
+CPUQuota=50%
+
+[Install]
+WantedBy = multi-user.target
+EOF
+
+systemctl daemon-reload
+
+```
+
+# Step 5 Configure Freshclam
+```
+sed -i '/^Example$/d' /etc/freshclam.conf
 sed -i '/REMOVE ME/d' /etc/sysconfig/freshclam
-systemctl enable clamd@scan
+
+cat << EOF > /usr/lib/systemd/system/clam-freshclam.service
+# Run the freshclam as daemon
+[Unit]
+Description = freshclam scanner
+After = network.target
+
+[Service]
+Type = forking
+ExecStart = /usr/bin/freshclam -d
+Restart = on-failure
+IOSchedulingPriority = 7
+CPUSchedulingPolicy = 5
+Nice = 19
+PrivateTmp = true
+
+[Install]
+WantedBy = multi-user.target
+EOF
+systemctl daemon-reload
+
 freshclam
+systemctl enable clam-freshclam.service
+systemctl start clam-freshclam.service
+
+```
+
+# Step 6 Configure clamav
+```
+systemctl enable clamd@scan
 systemctl start clamd@scan
 systemctl status clamd@scan
 ```
 
-# Step 5 Install Dependencies
+# Step 7 Install Dependencies
 ```
 yum -y install bind-utils rsync
 ```
-# Step 6
+# Step 8
 ```
 curl https://raw.githubusercontent.com/extremeshok/clamav-unofficial-sigs/master/clamav-unofficial-sigs.sh --output /usr/local/bin/clamav-unofficial-sigs.sh
-chmod 777 /usr/local/bin/clamav-unofficial-sigs.sh
+chmod 755 /usr/local/bin/clamav-unofficial-sigs.sh
 mkdir -p /etc/clamav-unofficial-sigs
 curl https://raw.githubusercontent.com/extremeshok/clamav-unofficial-sigs/master/config/master.conf --output /etc/clamav-unofficial-sigs/master.conf
 curl https://raw.githubusercontent.com/extremeshok/clamav-unofficial-sigs/master/config/os.centos7.conf --output /etc/clamav-unofficial-sigs/os.centos7.conf
 curl https://raw.githubusercontent.com/extremeshok/clamav-unofficial-sigs/master/config/user.conf --output /etc/clamav-unofficial-sigs/user.conf
 ```
 
-# Step 7
+# Step 9
 set your user options
 ```
 vim /etc/clamav-unofficial-sigs/user.conf
 ```
 
-# Step 9
+# Step 10
 run once to make sure there are no errors
 ```
 bash clamav-unofficial-sigs.sh
 ```
 
-# Step 10
+# Step 11
 ```
 bash clamav-unofficial-sigs.sh --install-all
 ```
diff --git a/guides/macosx.md b/guides/macosx.md
index 389386bd..f8563018 100644
--- a/guides/macosx.md
+++ b/guides/macosx.md
@@ -20,7 +20,7 @@ brew install clamav
 ```
 sudo su
 curl https://raw.githubusercontent.com/extremeshok/clamav-unofficial-sigs/master/clamav-unofficial-sigs.sh --output /usr/local/bin/clamav-unofficial-sigs.sh
-chmod 777  /usr/local/bin/clamav-unofficial-sigs.sh
+chmod 755  /usr/local/bin/clamav-unofficial-sigs.sh
 mkdir -p /etc/clamav-unofficial-sigs
 curl https://raw.githubusercontent.com/extremeshok/clamav-unofficial-sigs/master/config/master.conf --output /etc/clamav-unofficial-sigs/master.conf
 curl https://raw.githubusercontent.com/extremeshok/clamav-unofficial-sigs/master/config/os.macosx.conf --output /etc/clamav-unofficial-sigs/os.conf
diff --git a/guides/pfsense.md b/guides/pfsense.md
index 9cd6fb70..3776f579 100644
--- a/guides/pfsense.md
+++ b/guides/pfsense.md
@@ -24,7 +24,7 @@ pkg install rsync
 echo "fdesc	/dev/fd		fdescfs		rw	0	0" >> /etc/fstab
 ln -s /usr/local/bin/bash /bin/bash
 curl https://raw.githubusercontent.com/extremeshok/clamav-unofficial-sigs/master/clamav-unofficial-sigs.sh --output /usr/sbin/clamav-unofficial-sigs.sh
-chmod 777 /usr/sbin/clamav-unofficial-sigs.sh
+chmod 755 /usr/sbin/clamav-unofficial-sigs.sh
 mkdir -p /etc/clamav-unofficial-sigs
 curl https://raw.githubusercontent.com/extremeshok/clamav-unofficial-sigs/master/config/master.conf --output /etc/clamav-unofficial-sigs/master.conf
 curl https://raw.githubusercontent.com/extremeshok/clamav-unofficial-sigs/master/config/os.pfsense.conf --output /etc/clamav-unofficial-sigs/os.conf
@@ -59,6 +59,6 @@ SHELL=/bin/sh
 PATH=/usr/local/bin:$PATH
 /bin/bash /usr/sbin/clamav-unofficial-sigs.sh
 EOF
-chmod 777 /etc/rc.clamav-unofficial-sigs.sh
+chmod 755 /etc/rc.clamav-unofficial-sigs.sh
 echo -e "*/5 * * * * root /etc/rc.clamav-unofficial-sigs.sh\n\n" >> /etc/crontab
 ```