fix to cp error trapping (again)

This commit is contained in:
Asif Bacchus 2019-05-21 04:34:40 -06:00
parent 489c18c402
commit 4c07f53266

View File

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