diff --git a/create-update-postfix-pcre-chek-files.sh b/create-update-postfix-pcre-chek-files.sh index 39e8ffe..eccc5dd 100755 --- a/create-update-postfix-pcre-chek-files.sh +++ b/create-update-postfix-pcre-chek-files.sh @@ -7,7 +7,7 @@ clean_up() { # Perform program exit housekeeping rm -f $tmp_err_msg - echo "" + blank_line exit $1 } @@ -64,6 +64,7 @@ echo_failed(){ echo_skipped() { echo -e "\033[80G[ \033[33m\033[1mskipped\033[m ]" } + detect_os_1 () { if $(which lsb_release > /dev/null 2>&1) ; then @@ -92,6 +93,7 @@ detect_os_1 () { os_version="${os_version// /}" } + trim() { local var="$*" var="${var#"${var%%[![:space:]]*}"}" # remove leading whitespace characters @@ -99,6 +101,10 @@ trim() { echo -n "$var" } +blank_line() { + echo "" +} + # ------------- # --- Some default settings @@ -118,16 +124,18 @@ fi FORCE_UPDATE="" UPDATED=false +blank_line +blank_line + if [[ -f "/etc/postfix/header_checks.pcre" ]] \ || [[ -f "/etc/postfix/body_check.pcre" ]] \ || [[ -f "/etc/postfix/mime_header_check.pcre" ]]; then + echo -e " \033[1;32mUpdate/Create SPAM Header/MIME-Header-/Body PCRE check files..\033[m" + echo "" - echo -e "\033[32m--\033[m" echo "" - echo " Header/MIME-Header/Body Checks" - echo "" - echo " At least one PCRE check file exits. Should these files be updated?" + echo " At least one PCRE check file exits. Should these file(s) be updated?" echo "" echo -e " \033[33mType to choose the highlighted value\033[m" echo "" @@ -182,11 +190,12 @@ if [[ -f "/etc/postfix/header_checks.pcre" ]] \ echo "" else + + echo -e " \033[32mCreate SPAM Header/MIME-Header-/Body PCRE check files..\033[m" FORCE_UPDATE="true" fi - - +blank_line _file="/etc/postfix/header_checks.pcre"