From 4c07f532666e2e29af13640e5ef8ab6ae0241146 Mon Sep 17 00:00:00 2001 From: Asif Bacchus Date: Tue, 21 May 2019 04:34:40 -0600 Subject: [PATCH] fix to cp error trapping (again) --- f2b-config.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/f2b-config.sh b/f2b-config.sh index 921904a..51dbf03 100755 --- a/f2b-config.sh +++ b/f2b-config.sh @@ -118,29 +118,29 @@ echo ### copy template files # note: prefixing cp with '\' to override any alias settings # copy .local files -if [ ! "$(\cp --force --backup=simple --suffix=.original \ - etc/fail2ban/*.local "${F2B_DIR}/")" ]; then +if ! \cp --force --backup=simple --suffix=.original \ + etc/fail2ban/*.local "${F2B_DIR}/"; then copyFailure 'general config files (.local)' fi echo -e "${info}Copy general configuration files${normal} -- ${ok}[OK]${normal}" # copy action configuration files -if [ ! "$(\cp --force --backup=simple --suffix=.original \ - etc/fail2ban/action.d/* "${F2B_DIR}/action.d/")" ]; then +if ! \cp --force --backup=simple --suffix=.original \ + etc/fail2ban/action.d/* "${F2B_DIR}/action.d/"; then copyFailure 'action files' fi echo -e "${info}Copy action configuration files${normal} -- ${ok}[OK]${normal}" # copy filter configuration files -if [ ! "$(\cp --force --backup=simple --suffix=.original \ - etc/fail2ban/filter.d/* "${F2B_DIR}/filter.d/")" ]; then +if ! \cp --force --backup=simple --suffix=.original \ + etc/fail2ban/filter.d/* "${F2B_DIR}/filter.d/"; then copyFailure 'filter files' fi echo -e "${info}Copy filter configuration files${normal} -- ${ok}[OK]${normal}" # copy jail configuration files -if [ ! "$(\cp --force --backup=simple --suffix=.original \ - etc/fail2ban/jail.d/* "${F2B_DIR}/jail.d/")" ]; then +if ! \cp --force --backup=simple --suffix=.original \ + etc/fail2ban/jail.d/* "${F2B_DIR}/jail.d/"; then copyFailure 'jail files' fi echo -e "${info}Copy jail configuration files${normal} -- ${ok}[OK]${normal}"