Compare commits

...

2 Commits

Author SHA1 Message Date
Asif Bacchus 4c07f53266 fix to cp error trapping (again) 2019-05-21 04:34:40 -06:00
Asif Bacchus 489c18c402 update copyFailure output text 2019-05-21 04:20:48 -06:00
1 changed files with 9 additions and 9 deletions

View File

@ -25,7 +25,7 @@ function copyFailure {
"and rerun"
echo -e "this script."
echo
echo -e "${note}Error backing up: ${lit}$1"
echo -e "${normal}Error copying: ${lit}$1"
echo
echo -e "${err}Exiting.${normal}"
echo
@ -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}"