From d811bc03daeccd141ce9f9e9bffbe81d6cf0de7a Mon Sep 17 00:00:00 2001
From: Amish <3330468+amishmm@users.noreply.github.com>
Date: Fri, 30 Aug 2019 08:04:59 +0530
Subject: [PATCH 01/20] Put defaults in master.conf instead of user.conf

Put defaults in master.conf instead of user.conf
---
 config/master.conf | 2 +-
 config/user.conf   | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/config/master.conf b/config/master.conf
index 59e6a9aa..81e2bd4b 100644
--- a/config/master.conf
+++ b/config/master.conf
@@ -158,7 +158,7 @@ enable_yararules="no"   #Enables yararules in the various databases, automatical
 
 # Default dbs rating
 # valid rating: LOW, MEDIUM, HIGH
-default_dbs_rating="LOW"
+default_dbs_rating="MEDIUM"
 
 # Per Database
 # These ratings will override the global rating for the specific database
diff --git a/config/user.conf b/config/user.conf
index eeb193c4..1d0b1faa 100644
--- a/config/user.conf
+++ b/config/user.conf
@@ -28,13 +28,9 @@
 
 #securiteinfo_authorisation_signature="YOUR-SIGNATURE-NUMBER"
 
-sanesecurity_enabled="yes"
-
-linuxmalwaredetect_enabled="yes"
-
 # Default dbs rating
 # valid rating: LOW, MEDIUM, HIGH
-default_dbs_rating="MEDIUM"
+#default_dbs_rating="HIGH"
 
 # Per Database
 # These ratings will override the global rating for the specific database

From 37ba3a00087ad76136984b061e947f5cc5c04773 Mon Sep 17 00:00:00 2001
From: Amish <3330468+amishmm@users.noreply.github.com>
Date: Fri, 30 Aug 2019 08:24:38 +0530
Subject: [PATCH 02/20] Update os.archlinux.conf

Update the defaults used in Arch linux
---
 config/os/os.archlinux.conf | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/config/os/os.archlinux.conf b/config/os/os.archlinux.conf
index 04499cf6..83d4baa8 100644
--- a/config/os/os.archlinux.conf
+++ b/config/os/os.archlinux.conf
@@ -16,19 +16,22 @@
 # SEE MASTER.CONF FOR CONFIG EXPLANATIONS
 ################################################################################
 # Rename to os.conf to enable this file
+# DO NOT MAKE ANY CHANGES to this file.
+# Use user.conf to OVERRIDE THE OPTIONS IN THIS FILE
 ################################################################################
 
-# Archlinux
-
+# Archlinux specific settings
 clam_user="clamav"
 clam_group="clamav"
-
-clam_dbs="/var/lib/clamav"
-
 clamd_pid="/run/clamav/clamd.pid"
+clamd_reload_opt="/usr/bin/systemctl reload clamav-daemon.service"
+clamd_restart_opt="/usr/bin/systemctl restart clamav-daemon.service"
+clamd_socket="/run/clamav/clamd.ctl"
+clam_dbs="/var/lib/clamav"
+pkg_mgr="pacman"
+pkg_rm="pacman"
 
-clamd_restart_opt="systemctl restart clamd.service"
-
-#clamd_socket="/var/lib/clamav/clamd.sock"
+# defaults are now good enough to run out-of-box
+user_configuration_complete="yes"
 
 # https://eXtremeSHOK.com ######################################################

From 09f40bccd099116be6127154e416d22176b2564c Mon Sep 17 00:00:00 2001
From: eXtremeSHOK <admin@extremeshok.com>
Date: Sun, 1 Sep 2019 01:01:22 +0200
Subject: [PATCH 03/20] better log file permission fix

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

diff --git a/clamav-unofficial-sigs.sh b/clamav-unofficial-sigs.sh
index c83b8336..209a35e0 100644
--- a/clamav-unofficial-sigs.sh
+++ b/clamav-unofficial-sigs.sh
@@ -3326,9 +3326,15 @@ 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}"
+if xshok_is_root ; then
+	if [ "$enable_log" == "yes" ] ; then
+		# check if the file is owned by root (the current user)
+		if [ -O "${log_file_path}/${log_file_name}" ] ; then
+			# checks the file is writable and a file (not a symlink/link)
+			if [ -w "${log_file_path}/${log_file_name}" ] && [ -F "${log_file_path}/${log_file_name}" ] ; then
+				perms chown -f "${clam_user}:${clam_group}" "${log_file_path}/${log_file_name}"
+			fi
+		fi
 	fi
 fi
 

From 22fb26727807000d92ec26ac0d8e4e90afc90d56 Mon Sep 17 00:00:00 2001
From: eXtremeSHOK <admin@extremeshok.com>
Date: Sun, 1 Sep 2019 01:09:26 +0200
Subject: [PATCH 04/20] better attempt at output suppression

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

diff --git a/clamav-unofficial-sigs.sh b/clamav-unofficial-sigs.sh
index 209a35e0..6e1ce7ab 100644
--- a/clamav-unofficial-sigs.sh
+++ b/clamav-unofficial-sigs.sh
@@ -223,7 +223,7 @@ function xshok_pretty_echo_and_log() { # "string" "repeating" "count" "type"
 	myrepeating="$2"
 	mycount="$3"
 	mytype="$4"
-	if [ "$comment_silence" != "yes" ] ; then
+	if [ "$comment_silence" != "yes" ] && [ "$force_verbose" != "yes" ]; then
 		if [ ! -t 1 ] ; then
 			comment_silence="yes"
 		fi
@@ -1429,6 +1429,7 @@ fi
 config_version="0"
 do_clamd_reload="0"
 comment_silence="no"
+force_verbose="no"
 logging_enabled="no"
 force_updates="no"
 enable_log="no"
@@ -1894,7 +1895,7 @@ fi
 
 # Silence wget output and only report errors - useful if script is run via cron.
 if [ "$downloader_silence" == "yes" ] ; then
-  wget_output_level="--no-verbose" #--quiet
+  wget_output_level="--quiet"
   curl_output_level="--silent --show-error"
 else
   wget_output_level="--no-verbose"

From 175922dd773978cad561a026094e3baac9901f14 Mon Sep 17 00:00:00 2001
From: eXtremeSHOK <admin@extremeshok.com>
Date: Sun, 1 Sep 2019 01:21:28 +0200
Subject: [PATCH 05/20] -f not -F

---
 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 6e1ce7ab..459dc60f 100644
--- a/clamav-unofficial-sigs.sh
+++ b/clamav-unofficial-sigs.sh
@@ -3332,7 +3332,7 @@ if xshok_is_root ; then
 		# check if the file is owned by root (the current user)
 		if [ -O "${log_file_path}/${log_file_name}" ] ; then
 			# checks the file is writable and a file (not a symlink/link)
-			if [ -w "${log_file_path}/${log_file_name}" ] && [ -F "${log_file_path}/${log_file_name}" ] ; then
+			if [ -w "${log_file_path}/${log_file_name}" ] && [ -f "${log_file_path}/${log_file_name}" ] ; then
 				perms chown -f "${clam_user}:${clam_group}" "${log_file_path}/${log_file_name}"
 			fi
 		fi

From d34ef118c7ebef08020351090518cf26c73decfe Mon Sep 17 00:00:00 2001
From: eXtremeSHOK <admin@extremeshok.com>
Date: Sun, 1 Sep 2019 01:26:08 +0200
Subject: [PATCH 06/20] test verbose and silence

---
 .t/ci-test.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.t/ci-test.sh b/.t/ci-test.sh
index ddeb6838..7a10eefd 100644
--- a/.t/ci-test.sh
+++ b/.t/ci-test.sh
@@ -14,8 +14,8 @@ if [ -e "/var/lib/clamav/sanesecurity.ftm" ] ; then
 	rm -f /var/lib/clamav/sanesecurity.ftm
 fi
 
-echo "running script as root"
-sudo bash /usr/sbin/clamav-unofficial-sigs
+echo "running script as root and verbose"
+sudo bash /usr/sbin/clamav-unofficial-sigs --verbose
 if [ "$?" -eq "0" ] ; then
 	echo .. OK
 else
@@ -23,8 +23,8 @@ else
   exit 1
 fi
 
-echo "running script as clamav"
-sudo -u clamav  [ -x /usr/sbin/clamav-unofficial-sigs ] && bash /usr/sbin/clamav-unofficial-sigs --force
+echo "running script as clamav and silence"
+sudo -u clamav  [ -x /usr/sbin/clamav-unofficial-sigs ] && bash /usr/sbin/clamav-unofficial-sigs --force --silence
 if [ "$?" -eq "0" ] ; then
 	echo .. OK
 else

From 448bf9ac6678fb07f3a61ce7f357a7765363e13d Mon Sep 17 00:00:00 2001
From: eXtremeSHOK <admin@extremeshok.com>
Date: Mon, 2 Sep 2019 13:24:47 +0200
Subject: [PATCH 07/20] prepare for 6.0.2

---
 README.md                 | 10 ++++++++++
 clamav-unofficial-sigs.sh |  4 ++--
 config/master.conf        |  2 +-
 config/user.conf          | 10 +++++-----
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 8a9dc839..557c482e 100644
--- a/README.md
+++ b/README.md
@@ -180,6 +180,16 @@ Usage: clamav-unofficial-sigs.sh 	 [OPTION] [PATH|FILE]
   its associated files and databases from the system
 
 ## Change Log
+### Version 6.1.1 (Updated 02 September 2019)
+ - eXtremeSHOK.com Maintenance
+ - Update os.archlinux.conf, thanks @amishmm
+ - master.conf set default dbs rating to medium
+ - user.conf better suggested values
+ - Fix: suppress all non-error output under cron/non interactive terminal
+ - Fix: check log file is not a link before setting permissions, only set if owned by root.
+ - Minor enhancement to travis-ci checks
+ - Incremented the config to version 77
+
 ### Version 6.1.0 (Updated 27 August 2019)
  - eXtremeSHOK.com Maintenance
  - Thanks Reio Remma & Oliver Nissen
diff --git a/clamav-unofficial-sigs.sh b/clamav-unofficial-sigs.sh
index 459dc60f..cc94a1c1 100644
--- a/clamav-unofficial-sigs.sh
+++ b/clamav-unofficial-sigs.sh
@@ -1387,8 +1387,8 @@ EOF
 ################################################################################
 
 # Script Info
-script_version="6.1.0"
-script_version_date="2019-08-27"
+script_version="6.1.1"
+script_version_date="2019-09-02"
 minimum_required_config_version="76"
 minimum_yara_clamav_version="0.99"
 
diff --git a/config/master.conf b/config/master.conf
index 81e2bd4b..5670979a 100644
--- a/config/master.conf
+++ b/config/master.conf
@@ -548,6 +548,6 @@ yararulesproject_url="https://raw.githubusercontent.com/Yara-Rules/rules/master"
 
 # ========================
 # DO NOT EDIT !
-config_version="76"
+config_version="77"
 
 # https://eXtremeSHOK.com ######################################################
diff --git a/config/user.conf b/config/user.conf
index 1d0b1faa..5e79149a 100644
--- a/config/user.conf
+++ b/config/user.conf
@@ -28,17 +28,17 @@
 
 #securiteinfo_authorisation_signature="YOUR-SIGNATURE-NUMBER"
 
-# Default dbs rating
+# Default dbs rating (Default: MEDIUM)
 # valid rating: LOW, MEDIUM, HIGH
 #default_dbs_rating="HIGH"
 
 # Per Database
 # These ratings will override the global rating for the specific database
 # valid rating: LOW, MEDIUM, HIGH, DISABLE
-#sanesecurity_dbs_rating=""
-#securiteinfo_dbs_rating=""
-#linuxmalwaredetect_dbs_rating=""
-#yararulesproject_dbs_rating=""
+#sanesecurity_dbs_rating="HIGH"
+#securiteinfo_dbs_rating="HIGH"
+#linuxmalwaredetect_dbs_rating="HIGH"
+#yararulesproject_dbs_rating="HIGH"
 
 # =========================
 # Additional signature databases

From 99a322266ee7d7da770830a518ae1a0982bccfd6 Mon Sep 17 00:00:00 2001
From: eXtremeSHOK <admin@extremeshok.com>
Date: Mon, 2 Sep 2019 13:39:08 +0200
Subject: [PATCH 08/20] 6.1.1

---
 README.md                 | 1 +
 clamav-unofficial-sigs.sh | 1 +
 config/master.conf        | 1 +
 config/user.conf          | 1 +
 4 files changed, 4 insertions(+)

diff --git a/README.md b/README.md
index 557c482e..482db5e5 100644
--- a/README.md
+++ b/README.md
@@ -168,6 +168,7 @@ Usage: clamav-unofficial-sigs.sh 	 [OPTION] [PATH|FILE]
   based on your config files
 
 
+
 --install-logrotate 	 Install and generate the logrotate file, autodetects the
   values based on your config files
 
diff --git a/clamav-unofficial-sigs.sh b/clamav-unofficial-sigs.sh
index cc94a1c1..67210b61 100644
--- a/clamav-unofficial-sigs.sh
+++ b/clamav-unofficial-sigs.sh
@@ -1,3 +1,4 @@
+
 #!/usr/bin/env bash
 # shellcheck disable=SC2119
 # shellcheck disable=SC2120
diff --git a/config/master.conf b/config/master.conf
index 5670979a..1293fe4d 100644
--- a/config/master.conf
+++ b/config/master.conf
@@ -1,3 +1,4 @@
+
 # This file contains master configuration settings for clamav-unofficial-sigs.sh
 ###################
 # This is property of eXtremeSHOK.com
diff --git a/config/user.conf b/config/user.conf
index 5e79149a..20df3906 100644
--- a/config/user.conf
+++ b/config/user.conf
@@ -1,3 +1,4 @@
+
 # This file contains user configuration settings for clamav-unofficial-sigs.sh
 ###################
 # This is property of eXtremeSHOK.com

From 51d4a4336c02157db9bed2b56b7fc432c19bdb3f Mon Sep 17 00:00:00 2001
From: eXtremeSHOK <admin@extremeshok.com>
Date: Mon, 2 Sep 2019 13:42:31 +0200
Subject: [PATCH 09/20] 6.1.1

---
 README.md                 | 1 -
 clamav-unofficial-sigs.sh | 1 -
 config/master.conf        | 1 -
 config/user.conf          | 1 -
 4 files changed, 4 deletions(-)

diff --git a/README.md b/README.md
index 482db5e5..557c482e 100644
--- a/README.md
+++ b/README.md
@@ -168,7 +168,6 @@ Usage: clamav-unofficial-sigs.sh 	 [OPTION] [PATH|FILE]
   based on your config files
 
 
-
 --install-logrotate 	 Install and generate the logrotate file, autodetects the
   values based on your config files
 
diff --git a/clamav-unofficial-sigs.sh b/clamav-unofficial-sigs.sh
index 67210b61..cc94a1c1 100644
--- a/clamav-unofficial-sigs.sh
+++ b/clamav-unofficial-sigs.sh
@@ -1,4 +1,3 @@
-
 #!/usr/bin/env bash
 # shellcheck disable=SC2119
 # shellcheck disable=SC2120
diff --git a/config/master.conf b/config/master.conf
index 1293fe4d..5670979a 100644
--- a/config/master.conf
+++ b/config/master.conf
@@ -1,4 +1,3 @@
-
 # This file contains master configuration settings for clamav-unofficial-sigs.sh
 ###################
 # This is property of eXtremeSHOK.com
diff --git a/config/user.conf b/config/user.conf
index 20df3906..5e79149a 100644
--- a/config/user.conf
+++ b/config/user.conf
@@ -1,4 +1,3 @@
-
 # This file contains user configuration settings for clamav-unofficial-sigs.sh
 ###################
 # This is property of eXtremeSHOK.com

From ad403a148c6d8233e479a9c5915ab3ab0c85e91e Mon Sep 17 00:00:00 2001
From: eXtremeSHOK <admin@extremeshok.com>
Date: Mon, 2 Sep 2019 18:56:46 +0200
Subject: [PATCH 10/20] fix config list

---
 guides/ubuntu-debian.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/guides/ubuntu-debian.md b/guides/ubuntu-debian.md
index 78c4666a..35ced87a 100644
--- a/guides/ubuntu-debian.md
+++ b/guides/ubuntu-debian.md
@@ -21,9 +21,9 @@ wget https://raw.githubusercontent.com/extremeshok/clamav-unofficial-sigs/master
 wget https://raw.githubusercontent.com/extremeshok/clamav-unofficial-sigs/master/config/user.conf -c -O /etc/clamav-unofficial-sigs/user.conf
 ```
 Select your operating system config from https://github.com/extremeshok/clamav-unofficial-sigs/tree/master/config/
-**replace os.centos7.conf with your required config, centos6 = os.centos6.conf, centos7-atomic = os.centos7-atomic.conf, centos6-cpanel = os.centos6-cpanel.conf**
+**replace os.debian9.conf with your required config, ubuntu = ubuntu.conf, debian9 = os.debian9.conf, debian8 = os.debian8.conf, debian8-systemd = os.debian8.systemd.conf, debian7 = os.debian7.conf**
 ```
-os_conf="os.centos7.conf"
+os_conf="os.debian9.conf"
 wget "https://raw.githubusercontent.com/extremeshok/clamav-unofficial-sigs/master/config/os/${os_conf}" -c -O /etc/clamav-unofficial-sigs/os.conf
 ```
 

From 2875fb044a29d49eb2a82f78f8a67b31a025b229 Mon Sep 17 00:00:00 2001
From: eXtremeSHOK <admin@extremeshok.com>
Date: Mon, 2 Sep 2019 23:07:50 +0200
Subject: [PATCH 11/20] default to curl fix failed to create symbolic link

---
 README.md                 |  3 ++
 clamav-unofficial-sigs.sh | 86 +++++++++++++++++++++------------------
 config/master.conf        |  4 +-
 3 files changed, 51 insertions(+), 42 deletions(-)

diff --git a/README.md b/README.md
index 557c482e..c5044cb4 100644
--- a/README.md
+++ b/README.md
@@ -185,8 +185,11 @@ Usage: clamav-unofficial-sigs.sh 	 [OPTION] [PATH|FILE]
  - Update os.archlinux.conf, thanks @amishmm
  - master.conf set default dbs rating to medium
  - user.conf better suggested values
+ - Default to using curl, less logic required (lower cpu)
+ - force_curl replaces force_wget
  - Fix: suppress all non-error output under cron/non interactive terminal
  - Fix: check log file is not a link before setting permissions, only set if owned by root.
+ - Fix: failed to create symbolic link
  - Minor enhancement to travis-ci checks
  - Incremented the config to version 77
 
diff --git a/clamav-unofficial-sigs.sh b/clamav-unofficial-sigs.sh
index cc94a1c1..eea7bdfe 100644
--- a/clamav-unofficial-sigs.sh
+++ b/clamav-unofficial-sigs.sh
@@ -237,7 +237,7 @@ function xshok_pretty_echo_and_log() { # "string" "repeating" "count" "type"
 			mytype="w"
 		elif [[ "$mystring" =~ "ALERT:" ]] || [[ "$mystring" =~ "ALERT " ]] ; then
 			mytype="a"
-		elif [[ "$mystring" =~ "NOTICES:" ]] || [[ "$mystring" =~ "NOTICES " ]] ; then
+		elif [[ "$mystring" =~ "NOTICE:" ]] || [[ "$mystring" =~ "NOTICE " ]] ; then
 			mytype="n"
 		fi
 	fi
@@ -323,7 +323,11 @@ function xshok_draw_time_remaining() { #time_remaining #update_hours #name
 # Download function
 function xshok_file_download() { #outputfile #url #notimestamp
   if [ "${1}" ] && [ "${2}" ] ; then
-    if [ -n "$wget_bin" ] ; then
+		if [ -n "$curl_bin" ] ; then
+			# shellcheck disable=SC2086
+			$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=$?
+		else
 			if [ ! "${3}" ] ; then
 				# the following is required because wget, cannot do --timestamping and --output-document together
 				this_dir="$PWD"
@@ -337,6 +341,9 @@ function xshok_file_download() { #outputfile #url #notimestamp
 				cd "${output_dir}" || exit
 				if [ "$output_file" != "$url_file" ] ; then
 					if [ ! -f "$url_file" ] ; then
+						if [ ! -f "$output_file" ] ; then
+							touch "$output_file"
+						fi
 						ln -s  "$output_file" "$url_file"
 						wget_output_link="$url_file"
 					fi
@@ -354,10 +361,6 @@ function xshok_file_download() { #outputfile #url #notimestamp
 				$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
-      # shellcheck disable=SC2086
-      $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
     return $result
@@ -807,14 +810,14 @@ function output_system_configuration_information() {
   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
-    xshok_pretty_echo_and_log "*** WGET LOCATION & VERSION ***"
-    xshok_pretty_echo_and_log "${wget_bin}"
-    $wget_bin --version | head -1
+  if [ -n "$curl_bin" ] ; then
+		xshok_pretty_echo_and_log "*** CURL LOCATION & VERSION ***"
+		xshok_pretty_echo_and_log "${curl_bin}"
+		$curl_bin --version | head -1
   else
-    xshok_pretty_echo_and_log "*** CURL LOCATION & VERSION ***"
-    xshok_pretty_echo_and_log "${curl_bin}"
-    $curl_bin --version | head -1
+		xshok_pretty_echo_and_log "*** WGET LOCATION & VERSION ***"
+		xshok_pretty_echo_and_log "${wget_bin}"
+		$wget_bin --version | head -1
   fi
   if [ "$enable_gpg" == "yes" ] ; then
     xshok_pretty_echo_and_log "*** GPG LOCATION & VERSION ***"
@@ -1271,12 +1274,12 @@ function check_clamav() {
 
 # Check for a new version
 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/${git_branch}/clamav-unofficial-sigs.sh" -O - 2> /dev/null | $grep_bin "^script_version=" | head -n1 | cut -d '"' -f 2)"
+  if [ -n "$curl_bin" ] ; then
+		# 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/${git_branch}/clamav-unofficial-sigs.sh" 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/${git_branch}/clamav-unofficial-sigs.sh" 2> /dev/null | $grep_bin "^script_version=" | head -n1 | cut -d '"' -f 2)"
+		# 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/${git_branch}/clamav-unofficial-sigs.sh" -O - 2> /dev/null | $grep_bin "^script_version=" | head -n1 | cut -d '"' -f 2)"
   fi
   if [ "$latest_version" ] ; then
 # shellcheck disable=SC2183,SC2086
@@ -1288,12 +1291,12 @@ function check_new_version() {
 
 # Check for a 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/${git_branch}/config/master.conf" -O - 2> /dev/null | $grep_bin "^config_version=" | head -n1 | cut -d '"' -f 2)"
+  if [ -n "$curl_bin" ] ; then
+		# 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/${git_branch}/config/master.conf" 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/${git_branch}/config/master.conf" 2> /dev/null | $grep_bin "^config_version=" | head -n1 | cut -d '"' -f 2)"
+		# 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/${git_branch}/config/master.conf" -O - 2> /dev/null | $grep_bin "^config_version=" | head -n1 | cut -d '"' -f 2)"
   fi
   if [ "$latest_config_version" ] ; then
 # shellcheck disable=SC2183,SC2086
@@ -1457,12 +1460,25 @@ else
   grep_bin="$(command -v grep 2> /dev/null)"
 fi
 
+# Detect support for curl
+if [ -z "$curl_bin" ]; then
+	curl_bin="$(command -v curl 2> /dev/null)"
+fi
 # Detect support for wget
-if [ -x /usr/sfw/bin/wget ] ; then
-  wget_bin="/usr/sfw/bin/wget"
-else
-  wget_bin="$(command -v wget 2> /dev/null)"
+if [ -z "$curl_bin" ]; then
+	if [ -x /usr/sfw/bin/wget ] ; then
+	  wget_bin="/usr/sfw/bin/wget"
+	else
+	  wget_bin="$(command -v wget 2> /dev/null)"
+	fi
+fi
+
+# Force wget over curl.
+if [ ! -z "$curl_bin" ] && [ "$force_wget" == "yes" ] ; then
+		xshok_pretty_echo_and_log "NOTICE: Force wget enabled"
+	  curl_bin=""
 fi
+
 if [ -z "$wget_bin" ] && [ -z "$curl_bin" ]; then
   curl_bin="$(command -v curl 2> /dev/null)"
   if [ -z "$curl_bin" ] ; then
@@ -1470,6 +1486,7 @@ if [ -z "$wget_bin" ] && [ -z "$curl_bin" ]; then
     exit 1
   fi
 fi
+
 if [ ! -z "$wget_bin" ] ; then
   # wget compression support
   if $wget_bin --help | $grep_bin -q "compression=TYPE" ; then
@@ -1779,8 +1796,8 @@ if [ -z "$rsync_bin" ] ; then
   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
+if [ -z "$curl_bin" ] ; then
+  if [ -z "$wget_bin" ] ; then
     xshok_pretty_echo_and_log "ERROR: wget and curl binaries not found, script requires either wget or curl"
     exit 1
   fi
@@ -1828,17 +1845,6 @@ if [ ! -w "$clam_dbs" ] ; then
   exit 1
 fi
 
-# Force curl over wget.
-if [ ! -z "$wget_bin" ] && [ "$force_curl" == "yes" ] ; then
-  if [ -z "$curl_bin" ] ; then
-		curl_bin="$(command -v curl 2> /dev/null)"
-	fi
-	if [ ! -z "$curl_bin" ] ; then
-		xshok_pretty_echo_and_log "Force Curl: enabled"
-	  wget_bin=""
-  fi
-fi
-
 # Reset the update timers to force a full update.
 if [ "$force_updates" == "yes" ] ; then
   xshok_pretty_echo_and_log "Force Updates: enabled"
diff --git a/config/master.conf b/config/master.conf
index 5670979a..fd645057 100644
--- a/config/master.conf
+++ b/config/master.conf
@@ -414,8 +414,8 @@ max_sleep_time="600"   # Default maximum is 600 seconds (10 minutes).
 #curl_bin="/usr/bin/curl"
 #gpg_bin="/usr/bin/gpg"
 
-# force curl, by default wget is used when curl and wget is present.
-force_curl="no"
+# force wget, by default curl is used when curl and wget is present.
+force_wget="no"
 
 # GnuPG / Signature verification
 # To disable usage of gpg, set the following variable to "no".

From 4df8e5fba8d13429f747d1e78eff51db4fcf21fc Mon Sep 17 00:00:00 2001
From: eXtremeSHOK <admin@extremeshok.com>
Date: Mon, 2 Sep 2019 23:13:58 +0200
Subject: [PATCH 12/20] add force_wget to tests

---
 .t/ci-test.sh           | 11 ++++++++
 .t/tests/user_wget.conf | 59 +++++++++++++++++++++++++++++++++++++++++
 .travis.yml             |  2 +-
 3 files changed, 71 insertions(+), 1 deletion(-)
 create mode 100644 .t/tests/user_wget.conf

diff --git a/.t/ci-test.sh b/.t/ci-test.sh
index 7a10eefd..5fd9240d 100644
--- a/.t/ci-test.sh
+++ b/.t/ci-test.sh
@@ -14,7 +14,18 @@ if [ -e "/var/lib/clamav/sanesecurity.ftm" ] ; then
 	rm -f /var/lib/clamav/sanesecurity.ftm
 fi
 
+echo "running script as root and verbose and force_wget"
+sudo cp -f .t/tests/user_wget.conf /etc/clamav-unofficial-sigs/user.conf
+sudo bash /usr/sbin/clamav-unofficial-sigs --verbose
+if [ "$?" -eq "0" ] ; then
+	echo .. OK
+else
+ 	echo .. ERROR
+  exit 1
+fi
+
 echo "running script as root and verbose"
+sudo cp -f .t/tests/user.conf /etc/clamav-unofficial-sigs/user.conf
 sudo bash /usr/sbin/clamav-unofficial-sigs --verbose
 if [ "$?" -eq "0" ] ; then
 	echo .. OK
diff --git a/.t/tests/user_wget.conf b/.t/tests/user_wget.conf
new file mode 100644
index 00000000..adc530de
--- /dev/null
+++ b/.t/tests/user_wget.conf
@@ -0,0 +1,59 @@
+###################
+# This is property of eXtremeSHOK.com
+# You are free to use, modify and distribute, however you may not remove this notice.
+# Copyright (c) Adrian Jon Kriel :: admin@extremeshok.com
+# License: BSD (Berkeley Software Distribution)
+##################
+
+malwarepatrol_enabled="yes"
+malwarepatrol_receipt_code=$ci_malwarepatrol_receipt_code
+malwarepatrol_product_code=$ci_malwarepatrol_receipt_code
+malwarepatrol_list=$ci_malwarepatrol_receipt_code
+malwarepatrol_free=$ci_malwarepatrol_free
+
+securiteinfo_enabled="yes"
+securiteinfo_authorisation_signature=$ci_securiteinfo_authorisation_signature
+
+sanesecurity_enabled="yes"
+
+linuxmalwaredetect_enabled="yes"
+
+# THIS NEEDS TO BE TESTED
+yararules_enabled="no"
+enable_yararules="no"
+
+# Default dbs rating
+# valid rating: LOW, MEDIUM, HIGH
+default_dbs_rating="MEDIUM"
+
+# Per Database
+# These ratings will override the global rating for the specific database
+# valid rating: LOW, MEDIUM, HIGH, DISABLE
+sanesecurity_dbs_rating="HIGH"
+#securiteinfo_dbs_rating=""
+#linuxmalwaredetect_dbs_rating=""
+#yararulesproject_dbs_rating=""
+
+enable_gpg="no"
+
+user_configuration_complete="yes"
+
+declare -a additional_dbs=(
+https://raw.githubusercontent.com/wmetcalf/clam-punch/master/miscreantpunch099.ldb
+https://raw.githubusercontent.com/wmetcalf/clam-punch/master/MiscreantPunch099-Low.ldb
+) #END ADDITIONAL DATABASES
+
+
+declare -a securiteinfo_dbs=(
+securiteinfo.ign2|REQUIRED
+securiteinfo.hdb|LOW
+javascript.ndb|LOW
+securiteinfohtml.hdb|LOW
+securiteinfoascii.hdb|LOW
+securiteinfopdf.hdb|LOW
+securiteinfoandroid.hdb|LOW #
+spam_marketing.ndb|HIGH
+) #END SECURITEINFO DATABASES
+
+#foce wget
+force_wget="yes"
diff --git a/.travis.yml b/.travis.yml
index a6e98d1a..f9cb4502 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,7 +28,7 @@ dist: bionic
 
 before_install:
   - sudo apt-get update -qq
-  - sudo apt-get install -y ca-certificates wget rsync p7zip-full shellcheck -qq
+  - sudo apt-get install -y ca-certificates curl wget rsync p7zip-full shellcheck -qq
   #- sudo pip install bashate
   # - "sudo mkdir -p tmp/cache/"
   # - "ls -laFh tmp/cache/clamav-dbs"

From 3a596a72f4ae96f10c95f6c7fdb25368c51dffa2 Mon Sep 17 00:00:00 2001
From: eXtremeSHOK <admin@extremeshok.com>
Date: Mon, 2 Sep 2019 23:20:25 +0200
Subject: [PATCH 13/20] Fix: curl --compress ->> cirl --compressed

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

diff --git a/README.md b/README.md
index c5044cb4..e0f28e76 100644
--- a/README.md
+++ b/README.md
@@ -190,6 +190,7 @@ Usage: clamav-unofficial-sigs.sh 	 [OPTION] [PATH|FILE]
  - Fix: suppress all non-error output under cron/non interactive terminal
  - Fix: check log file is not a link before setting permissions, only set if owned by root.
  - Fix: failed to create symbolic link
+ - Fix: curl --compress ->> cirl --compressed
  - Minor enhancement to travis-ci checks
  - Incremented the config to version 77
 
diff --git a/clamav-unofficial-sigs.sh b/clamav-unofficial-sigs.sh
index eea7bdfe..b797ccad 100644
--- a/clamav-unofficial-sigs.sh
+++ b/clamav-unofficial-sigs.sh
@@ -325,7 +325,7 @@ function xshok_file_download() { #outputfile #url #notimestamp
   if [ "${1}" ] && [ "${2}" ] ; then
 		if [ -n "$curl_bin" ] ; then
 			# shellcheck disable=SC2086
-			$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}"
+			$curl_bin --fail --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}"
 			result=$?
 		else
 			if [ ! "${3}" ] ; then
@@ -1276,7 +1276,7 @@ function check_clamav() {
 function check_new_version() {
   if [ -n "$curl_bin" ] ; then
 		# 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/${git_branch}/clamav-unofficial-sigs.sh" 2> /dev/null | $grep_bin "^script_version=" | head -n1 | cut -d '"' -f 2)"
+		latest_version="$($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}" "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)"
 	else
 		# 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/${git_branch}/clamav-unofficial-sigs.sh" -O - 2> /dev/null | $grep_bin "^script_version=" | head -n1 | cut -d '"' -f 2)"
@@ -1293,7 +1293,7 @@ function check_new_version() {
 function check_new_config_version() {
   if [ -n "$curl_bin" ] ; then
 		# 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/${git_branch}/config/master.conf" 2> /dev/null | $grep_bin "^config_version=" | head -n1 | cut -d '"' -f 2)"
+		latest_config_version="$($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}" "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)"
   else
 		# 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/${git_branch}/config/master.conf" -O - 2> /dev/null | $grep_bin "^config_version=" | head -n1 | cut -d '"' -f 2)"
@@ -1490,7 +1490,7 @@ fi
 if [ ! -z "$wget_bin" ] ; then
   # wget compression support
   if $wget_bin --help | $grep_bin -q "compression=TYPE" ; then
-    wget_compression="--compression=auto"
+    wget_compression="--compressedion=auto"
   else
     wget_compression=""
   fi

From 49f368b7d6ed4872c7b0caf185ac71064da37012 Mon Sep 17 00:00:00 2001
From: eXtremeSHOK <admin@extremeshok.com>
Date: Mon, 2 Sep 2019 23:25:37 +0200
Subject: [PATCH 14/20] force_wget

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

diff --git a/clamav-unofficial-sigs.sh b/clamav-unofficial-sigs.sh
index b797ccad..279fd744 100644
--- a/clamav-unofficial-sigs.sh
+++ b/clamav-unofficial-sigs.sh
@@ -1435,6 +1435,7 @@ comment_silence="no"
 force_verbose="no"
 logging_enabled="no"
 force_updates="no"
+force_wget="no"
 enable_log="no"
 custom_config="no"
 we_have_a_config="0"
@@ -1464,6 +1465,11 @@ fi
 if [ -z "$curl_bin" ]; then
 	curl_bin="$(command -v curl 2> /dev/null)"
 fi
+# Force wget over curl.
+if [ ! -z "$curl_bin" ] && [ "$force_wget" == "yes" ] ; then
+		xshok_pretty_echo_and_log "NOTICE: Force wget enabled"
+	  curl_bin=""
+fi
 # Detect support for wget
 if [ -z "$curl_bin" ]; then
 	if [ -x /usr/sfw/bin/wget ] ; then
@@ -1472,13 +1478,6 @@ if [ -z "$curl_bin" ]; then
 	  wget_bin="$(command -v wget 2> /dev/null)"
 	fi
 fi
-
-# Force wget over curl.
-if [ ! -z "$curl_bin" ] && [ "$force_wget" == "yes" ] ; then
-		xshok_pretty_echo_and_log "NOTICE: Force wget enabled"
-	  curl_bin=""
-fi
-
 if [ -z "$wget_bin" ] && [ -z "$curl_bin" ]; then
   curl_bin="$(command -v curl 2> /dev/null)"
   if [ -z "$curl_bin" ] ; then

From ef8e7c43c189776038904064138c9a05a631391d Mon Sep 17 00:00:00 2001
From: eXtremeSHOK <admin@extremeshok.com>
Date: Mon, 2 Sep 2019 23:34:04 +0200
Subject: [PATCH 15/20] fix force_wget not enabling

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

diff --git a/clamav-unofficial-sigs.sh b/clamav-unofficial-sigs.sh
index 279fd744..0f067a8b 100644
--- a/clamav-unofficial-sigs.sh
+++ b/clamav-unofficial-sigs.sh
@@ -1465,18 +1465,11 @@ fi
 if [ -z "$curl_bin" ]; then
 	curl_bin="$(command -v curl 2> /dev/null)"
 fi
-# Force wget over curl.
-if [ ! -z "$curl_bin" ] && [ "$force_wget" == "yes" ] ; then
-		xshok_pretty_echo_and_log "NOTICE: Force wget enabled"
-	  curl_bin=""
-fi
 # Detect support for wget
-if [ -z "$curl_bin" ]; then
-	if [ -x /usr/sfw/bin/wget ] ; then
-	  wget_bin="/usr/sfw/bin/wget"
-	else
-	  wget_bin="$(command -v wget 2> /dev/null)"
-	fi
+if [ -x /usr/sfw/bin/wget ] ; then
+  wget_bin="/usr/sfw/bin/wget"
+else
+  wget_bin="$(command -v wget 2> /dev/null)"
 fi
 if [ -z "$wget_bin" ] && [ -z "$curl_bin" ]; then
   curl_bin="$(command -v curl 2> /dev/null)"
@@ -1821,7 +1814,7 @@ if [ "$enable_gpg" == "yes" ] ; then
   fi
 fi
 if [ "$enable_gpg" != "yes" ] ; then
-  xshok_pretty_echo_and_log "GnuPG / signature verification disabled"
+  xshok_pretty_echo_and_log "NOTICE: GnuPG / signature verification disabled"
 fi
 # Check default directories are defined
 if [ -z "$work_dir" ] ; then
@@ -1846,7 +1839,7 @@ fi
 
 # Reset the update timers to force a full update.
 if [ "$force_updates" == "yes" ] ; then
-  xshok_pretty_echo_and_log "Force Updates: enabled"
+  xshok_pretty_echo_and_log "NOTICE: Forced updates enabled"
   sanesecurity_update_hours="0"
   securiteinfo_update_hours="0"
   linuxmalwaredetect_update_hours="0"
@@ -1855,6 +1848,12 @@ if [ "$force_updates" == "yes" ] ; then
   additional_update_hours="0"
 fi
 
+# Force wget over curl.
+if [ ! -z "$wget" ] && [ "$force_wget" == "yes" ] ; then
+		xshok_pretty_echo_and_log "NOTICE: Force wget enabled"
+	  curl_bin=""
+fi
+
 # Enable pid file to prevent issues with multiple instances
 # opted not to use flock as it appears to have issues with some systems
 if [ "$enable_locking" == "yes" ] ; then

From dfb571447bdfe2c65007acbfccbcb9da51d0071d Mon Sep 17 00:00:00 2001
From: eXtremeSHOK <admin@extremeshok.com>
Date: Mon, 2 Sep 2019 23:49:40 +0200
Subject: [PATCH 16/20] fix curl Illegal date format for -z, --time-cond

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

diff --git a/clamav-unofficial-sigs.sh b/clamav-unofficial-sigs.sh
index 0f067a8b..a13215d3 100644
--- a/clamav-unofficial-sigs.sh
+++ b/clamav-unofficial-sigs.sh
@@ -324,9 +324,15 @@ function xshok_draw_time_remaining() { #time_remaining #update_hours #name
 function xshok_file_download() { #outputfile #url #notimestamp
   if [ "${1}" ] && [ "${2}" ] ; then
 		if [ -n "$curl_bin" ] ; then
-			# shellcheck disable=SC2086
-			$curl_bin --fail --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}"
-			result=$?
+			if [ -f "${1}" ] ; then
+				# shellcheck disable=SC2086
+				$curl_bin --fail --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}"
+				result=$?
+			else
+				# shellcheck disable=SC2086
+				$curl_bin --fail --compressed $curl_proxy $curl_insecure $curl_output_level --connect-timeout "${downloader_connect_timeout}" --remote-time --location --retry "${downloader_tries}" --max-time "${downloader_max_time}" --output "${1}" "${2}"
+				result=$?
+			fi
 		else
 			if [ ! "${3}" ] ; then
 				# the following is required because wget, cannot do --timestamping and --output-document together

From 9d7409c09954e81542c1679c7501236f4c31ba71 Mon Sep 17 00:00:00 2001
From: eXtremeSHOK <admin@extremeshok.com>
Date: Tue, 3 Sep 2019 00:08:37 +0200
Subject: [PATCH 17/20] initialize sooner and fix wget not forcing

---
 clamav-unofficial-sigs.sh | 53 +++++++++++++++++++--------------------
 1 file changed, 26 insertions(+), 27 deletions(-)

diff --git a/clamav-unofficial-sigs.sh b/clamav-unofficial-sigs.sh
index a13215d3..508484f9 100644
--- a/clamav-unofficial-sigs.sh
+++ b/clamav-unofficial-sigs.sh
@@ -1411,6 +1411,19 @@ minimum_yara_clamav_version="0.99"
 #     # whatever you want to do when arr doesn't contain value
 # fi
 
+# Initialise
+config_version="0"
+do_clamd_reload="0"
+comment_silence="no"
+force_verbose="no"
+logging_enabled="no"
+force_updates="no"
+force_wget="no"
+enable_log="no"
+custom_config="no"
+we_have_a_config="0"
+
+
 # Attempt to scan for a valid config dir
 if [ -f "/etc/clamav-unofficial-sigs/master.conf" ] ; then
   config_dir="/etc/clamav-unofficial-sigs"
@@ -1433,19 +1446,6 @@ if [ -r "${config_dir}/user.conf" ] ; then
 	config_files+=( "${config_dir}/user.conf" )
 fi
 
-
-# Initialise
-config_version="0"
-do_clamd_reload="0"
-comment_silence="no"
-force_verbose="no"
-logging_enabled="no"
-force_updates="no"
-force_wget="no"
-enable_log="no"
-custom_config="no"
-we_have_a_config="0"
-
 # Solaris command -v function returns garbage when the program is not found
 # only define the new command -v function if running under Solaris
 if [ "$(uname -s)" == "SunOS" ] ; then
@@ -1472,10 +1472,12 @@ if [ -z "$curl_bin" ]; then
 	curl_bin="$(command -v curl 2> /dev/null)"
 fi
 # Detect support for wget
-if [ -x /usr/sfw/bin/wget ] ; then
-  wget_bin="/usr/sfw/bin/wget"
-else
-  wget_bin="$(command -v wget 2> /dev/null)"
+if [ -z "$wget_bin" ]; then
+	if [ -x /usr/sfw/bin/wget ] ; then
+	  wget_bin="/usr/sfw/bin/wget"
+	else
+	  wget_bin="$(command -v wget 2> /dev/null)"
+	fi
 fi
 if [ -z "$wget_bin" ] && [ -z "$curl_bin" ]; then
   curl_bin="$(command -v curl 2> /dev/null)"
@@ -1493,7 +1495,6 @@ if [ ! -z "$wget_bin" ] ; then
     wget_compression=""
   fi
 fi
-
 # Detect support for dig or host
 dig_bin="$(command -v dig 2> /dev/null)"
 if [ -z "$dig_bin" ] ; then
@@ -1503,8 +1504,6 @@ if [ -z "$dig_bin" ] ; then
     exit 1
   fi
 fi
-
-
 # Detect if terminal
 if [ -t 1 ] ; then
   # Set fonts
@@ -1774,6 +1773,12 @@ fi
 # dont assign , but remove trailing /
 shopt -s extglob; clam_dbs="${clam_dbs%%+(/)}"
 
+# Force wget over curl.
+if [ ! -z "$wget_bin" ] && [ "$force_wget" == "yes" ] ; then
+		xshok_pretty_echo_and_log "NOTICE: Forcing wget"
+	  curl_bin=""
+fi
+
 # SANITY checks
 # Check default Binaries & Commands are defined
 if [ "$reload_dbs" == "yes" ] ; then
@@ -1845,7 +1850,7 @@ fi
 
 # Reset the update timers to force a full update.
 if [ "$force_updates" == "yes" ] ; then
-  xshok_pretty_echo_and_log "NOTICE: Forced updates enabled"
+  xshok_pretty_echo_and_log "NOTICE: forcing updates"
   sanesecurity_update_hours="0"
   securiteinfo_update_hours="0"
   linuxmalwaredetect_update_hours="0"
@@ -1854,12 +1859,6 @@ if [ "$force_updates" == "yes" ] ; then
   additional_update_hours="0"
 fi
 
-# Force wget over curl.
-if [ ! -z "$wget" ] && [ "$force_wget" == "yes" ] ; then
-		xshok_pretty_echo_and_log "NOTICE: Force wget enabled"
-	  curl_bin=""
-fi
-
 # Enable pid file to prevent issues with multiple instances
 # opted not to use flock as it appears to have issues with some systems
 if [ "$enable_locking" == "yes" ] ; then

From 04f41207f674dfdffb331344095e03a9d1ab6258 Mon Sep 17 00:00:00 2001
From: eXtremeSHOK <admin@extremeshok.com>
Date: Tue, 3 Sep 2019 00:09:42 +0200
Subject: [PATCH 18/20] fix wget compression

---
 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 508484f9..9f1884ee 100644
--- a/clamav-unofficial-sigs.sh
+++ b/clamav-unofficial-sigs.sh
@@ -1490,7 +1490,7 @@ fi
 if [ ! -z "$wget_bin" ] ; then
   # wget compression support
   if $wget_bin --help | $grep_bin -q "compression=TYPE" ; then
-    wget_compression="--compressedion=auto"
+    wget_compression="--compression=auto"
   else
     wget_compression=""
   fi

From 55b0ac82cc6bc5d75f2f02564ba167f0bb82cc6f Mon Sep 17 00:00:00 2001
From: eXtremeSHOK <admin@extremeshok.com>
Date: Tue, 3 Sep 2019 00:17:50 +0200
Subject: [PATCH 19/20] 6.1.1

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e0f28e76..9e118ecb 100644
--- a/README.md
+++ b/README.md
@@ -190,7 +190,7 @@ Usage: clamav-unofficial-sigs.sh 	 [OPTION] [PATH|FILE]
  - Fix: suppress all non-error output under cron/non interactive terminal
  - Fix: check log file is not a link before setting permissions, only set if owned by root.
  - Fix: failed to create symbolic link
- - Fix: curl --compress ->> cirl --compressed
+ - Fix: curl --compress ->> curl --compressed
  - Minor enhancement to travis-ci checks
  - Incremented the config to version 77
 

From 3677207a93048114669d05711f7810630db6f945 Mon Sep 17 00:00:00 2001
From: eXtremeSHOK <admin@extremeshok.com>
Date: Tue, 3 Sep 2019 00:19:22 +0200
Subject: [PATCH 20/20] release docs

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 9e118ecb..b9c625e2 100644
--- a/README.md
+++ b/README.md
@@ -186,7 +186,7 @@ Usage: clamav-unofficial-sigs.sh 	 [OPTION] [PATH|FILE]
  - master.conf set default dbs rating to medium
  - user.conf better suggested values
  - Default to using curl, less logic required (lower cpu)
- - force_curl replaces force_wget
+ - force_curl replaced with force_wget
  - Fix: suppress all non-error output under cron/non interactive terminal
  - Fix: check log file is not a link before setting permissions, only set if owned by root.
  - Fix: failed to create symbolic link