install_amavis.sh: some minor changes..

This commit is contained in:
Christoph 2021-10-24 23:57:38 +02:00
parent 586566bcbd
commit 74c57d33ed

View File

@ -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