From f1c46049926f9d3223333d83483bdb4aec69a8f8 Mon Sep 17 00:00:00 2001
From: Christoph Kuchenbuch <ckubu@oopen.de>
Date: Wed, 21 Sep 2022 12:17:12 +0200
Subject: [PATCH] install_amavis.sh: inor changes to script output.

---
 install_amavis.sh | 37 +++++++++++++++++++++++++++++++++----
 1 file changed, 33 insertions(+), 4 deletions(-)

diff --git a/install_amavis.sh b/install_amavis.sh
index d2a6785..f492bc8 100755
--- a/install_amavis.sh
+++ b/install_amavis.sh
@@ -3495,6 +3495,8 @@ $(cat $tmp_err_msg)
 			read OK
 		done
 		[[ $OK = "yes" ]] || fatal "Abbruch durch User"
+      echo ""
+      echo ""
    fi
    echononl "   Install logrotate configuration"
    /usr/local/sbin/clamav-unofficial-sigs.sh --install-logrotate > $tmp_err_msg 2>&1
@@ -3502,7 +3504,11 @@ $(cat $tmp_err_msg)
       echo_ok
    else
       echo_failed
-      error "$(cat $tmp_err_msg)"
+      error "
+$(cat $tmp_err_msg)
+
+                   command was:
+                   /usr/local/sbin/clamav-unofficial-sigs.sh --install-logrotate"
 
 		echononl "continue anyway [yes/no]: "
 		read OK
@@ -3512,14 +3518,21 @@ $(cat $tmp_err_msg)
 			read OK
 		done
 		[[ $OK = "yes" ]] || fatal "Abbruch durch User"
+      echo ""
+      echo ""
    fi
+
    echononl "   Install man (help) file"
    /usr/local/sbin/clamav-unofficial-sigs.sh --install-man > $tmp_err_msg 2>&1
    if [[ $? -eq 0 ]] ; then
       echo_ok
    else
       echo_failed
-      error "$(cat $tmp_err_msg)"
+      error "
+$(cat $tmp_err_msg)
+
+                   command was:
+                   /usr/local/sbin/clamav-unofficial-sigs.sh --install-man"
 
 		echononl "continue anyway [yes/no]: "
 		read OK
@@ -3529,6 +3542,8 @@ $(cat $tmp_err_msg)
 			read OK
 		done
 		[[ $OK = "yes" ]] || fatal "Abbruch durch User"
+      echo ""
+      echo ""
    fi
 
    echononl "   Whitelist signature 'MBL_27966083'.."
@@ -3537,7 +3552,11 @@ $(cat $tmp_err_msg)
       echo_ok
    else
       echo_failed
-      error "$(cat $tmp_err_msg)"
+      error "
+$(cat $tmp_err_msg)
+
+                   command was:
+                   echo "MBL_27966083" >> /var/lib/clamav/my_whitelist.ign2"
 
 		echononl "continue anyway [yes/no]: "
 		read OK
@@ -3547,6 +3566,8 @@ $(cat $tmp_err_msg)
 			read OK
 		done
 		[[ $OK = "yes" ]] || fatal "Abbruch durch User"
+      echo ""
+      echo ""
    fi
 
 
@@ -3557,7 +3578,11 @@ $(cat $tmp_err_msg)
       echo_ok
    else
       echo_failed
-      error "$(cat $tmp_err_msg)"
+      error "
+$(cat $tmp_err_msg)
+
+                   command was:
+                   /usr/local/sbin/clamav-unofficial-sigs.sh"
 
 		echononl "continue anyway [yes/no]: "
 		read OK
@@ -3567,6 +3592,8 @@ $(cat $tmp_err_msg)
 			read OK
 		done
 		[[ $OK = "yes" ]] || fatal "Abbruch durch User"
+      echo ""
+      echo ""
    fi
 
 
@@ -3586,6 +3613,8 @@ $(cat $tmp_err_msg)
 			read OK
 		done
 		[[ $OK = "yes" ]] || fatal "Abbruch durch User"
+      echo ""
+      echo ""
    fi
 
 fi # if $INSTALL_CLAMAV_UNOFFICIAL_SIGS