From 74c57d33ed544f394012147de38c7a4b0c0090b9 Mon Sep 17 00:00:00 2001
From: Christoph Kuchenbuch <ckubu@oopen.de>
Date: Sun, 24 Oct 2021 23:57:38 +0200
Subject: [PATCH] install_amavis.sh: some minor changes..

---
 install_amavis.sh | 32 +++++++++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/install_amavis.sh b/install_amavis.sh
index fbdc5a6..6dd2dd4 100755
--- a/install_amavis.sh
+++ b/install_amavis.sh
@@ -928,6 +928,16 @@ if [[ -n "$needed_packages_base" ]]; then
    else
       echo_failed
       error "$(cat $tmp_err_msg)"
+
+      echononl "\tcontinue anyway [yes/no]: "
+      read OK
+      OK="$(echo "$OK" | tr '[:upper:]' '[:lower:]')"
+      while [[ "$OK" != "yes" ]] && [[  "$OK" != "no" ]] ; do
+         echononl "Wrong entry! - repeat [yes/nno]: "
+         read OK
+      done
+      [[ $OK = "yes" ]] || fatal "Abbruch durch User"
+
    fi
 else
    echo_skipped
@@ -943,7 +953,20 @@ for _module in $_needed_cpan_modules ; do
    cpanm -q --skip-installed $_module  > "$tmp_err_msg" 2>&1
    if [[ "$?" -ne 0 ]] ; then
       installation_failed=true
-      error "$(cat $tmp_err_msg)"
+      error "$(cat $tmp_err_msg)
+
+                   command was: 
+                   cpanm -q --skip-installed $_module"
+
+      echononl "\tcontinue anyway [yes/no]: "
+      read OK
+      OK="$(echo "$OK" | tr '[:upper:]' '[:lower:]')"
+      while [[ "$OK" != "yes" ]] && [[  "$OK" != "no" ]] ; do
+         echononl "Wrong entry! - repeat [yes/nno]: "
+         read OK
+      done
+      [[ $OK = "yes" ]] || fatal "Abbruch durch User"
+
    fi
 done
 if ! $installation_failed ; then
@@ -2978,7 +3001,10 @@ if $INSTALL_CLAMAV_UNOFFICIAL_SIGS ; then
       echo_ok
    else
       echo_failed
-      error "$(cat $tmp_err_msg)"
+      error "$(cat $tmp_err_msg)
+
+                   command was: 
+                   cpanm -q --skip-installed $_module"
 
 		echononl "continue anyway [yes/no]: "
 		read OK
@@ -3266,7 +3292,7 @@ if $INSTALL_CLAMAV_UNOFFICIAL_SIGS ; then
 			fi
 		else
 			error "Cannot create file 'os.conf' (No Debian Version detected).
-                    See file /etc/clamav-unofficial-sigs/INSTALL to create it manually"
+                    See file /etc/clamav-unofficial-sigs/INSTALL.md to create it manually"
 
 			echononl "continue anyway [yes/no]: "
 			read OK