rm func:backupFiles, add func copyFailure

This commit is contained in:
Asif Bacchus 2019-05-20 17:36:52 -06:00
parent 259d4c9303
commit 36fd119666
1 changed files with 16 additions and 22 deletions

View File

@ -21,24 +21,18 @@ note="\e[95m"
### functions ### functions
function backupFiles { function copyFailureure {
# check if file exists echo
if [ -f "${F2B-DIR}/$1" ]; then echo -e "${err}There was a problem backing up your current configuration."
if [ "$(cp "${F2B-DIR}/$1" "${F2B-DIR}/$1.original")" -ne 0 ]; then echo -e "This suggests some kind of permissions error. Please remedy this" \
echo "and rerun"
echo -e "${err}There was a problem backing up your current" \ echo -e "this script."
"configuration." echo
echo -e "This suggests some kind of permissions error. Please" \ echo -e "${note}Error backing up: ${lit}$1"
"remedy this and rerun" echo
echo -e "this script." echo -e "${err}Exiting.${normal}"
echo echo
echo -e "${note}Error backing up file: ${lit}$1" exit 100
echo
echo -e "${err}Exiting.${normal}"
echo
exit 100
fi
fi
} }
### end of functions ### end of functions
@ -92,28 +86,28 @@ echo
# copy .local files # copy .local files
if [ "$(\cp --force --backup=simple --suffix=.original \ if [ "$(\cp --force --backup=simple --suffix=.original \
etc/fail2ban/*.local "${F2B-DIR}/")" -ne 0 ]; then etc/fail2ban/*.local "${F2B-DIR}/")" -ne 0 ]; then
copyFail copyFailure 'general config files (.local)'
fi fi
echo -e "${info}Copy general configuration files${normal} -- ${ok}[OK]${normal}" echo -e "${info}Copy general configuration files${normal} -- ${ok}[OK]${normal}"
# copy action configuration files # copy action configuration files
if [ "$(\cp --force --backup=simple --suffix=.original \ if [ "$(\cp --force --backup=simple --suffix=.original \
etc/fail2ban/action.d/* "${F2B-DIR}/action.d/")" -ne 0 ]; then etc/fail2ban/action.d/* "${F2B-DIR}/action.d/")" -ne 0 ]; then
copyFail copyFailure 'action files'
fi fi
echo -e "${info}Copy action configuration files${normal} -- ${ok}[OK]${normal}" echo -e "${info}Copy action configuration files${normal} -- ${ok}[OK]${normal}"
# copy filter configuration files # copy filter configuration files
if [ "$(\cp --force --backup=simple --suffix=.original \ if [ "$(\cp --force --backup=simple --suffix=.original \
etc/fail2ban/filter.d/* "${F2B-DIR}/filter.d/")" -ne 0 ]; then etc/fail2ban/filter.d/* "${F2B-DIR}/filter.d/")" -ne 0 ]; then
copyFail copyFailure 'filter files'
fi fi
echo -e "${info}Copy filter configuration files${normal} -- ${ok}[OK]${normal}" echo -e "${info}Copy filter configuration files${normal} -- ${ok}[OK]${normal}"
# copy jail configuration files # copy jail configuration files
if [ "$(\cp --force --backup=simple --suffix=.original \ if [ "$(\cp --force --backup=simple --suffix=.original \
etc/fail2ban/jail.d/* "${F2B-DIR}/jail.d/")" -ne 0 ]; then etc/fail2ban/jail.d/* "${F2B-DIR}/jail.d/")" -ne 0 ]; then
copyFail copyFailure 'jail files'
fi fi
echo -e "${info}Copy jail configuration files${normal} -- ${ok}[OK]${normal}" echo -e "${info}Copy jail configuration files${normal} -- ${ok}[OK]${normal}"