asif/NextCloudBackup
1
0
Fork 0
Code Issues Pull Requests Releases 2 Activity

Added warning list to error exit sections

Browse Source
This commit is contained in:
Asif Bacchus 2018-09-07 04:14:12 -06:00
parent 7d3a59222e
commit 1a3cfcb729
1 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
root/scripts/borgbackup.sh
View File

@ -165,14 +165,34 @@ function quit {
exit "$1" exit "$1"
elif [ $"2" = "error" ]; then elif [ $"2" = "error" ]; then
# this is a deferred exit, codes need to be listed # this is a deferred exit, codes need to be listed
echo -e "\e[1;31m[`date +%Y-%m-%d` `date +%H:%M:%S`]" \ # check if there are warnings in addtion to errors
"--Script exited with ERROR(S) (code: ${exitError[*]})--\e[0m" >> $logFile if [ ${#exitWarning[@]} -gt 0 ]; then
exit "$1" echo -e "\e[1;31m[`date +%Y-%m-%d` `date +%H:%M:%S`]" >> $logFile
echo -e "\e[1;33m--Script exited with WARNING(S)" \
"(code: ${exitWarning[*]})--" >> $logFile
echo -e "\e[1;31m--Script exited with ERROR(S)" \
"(code: ${exitError[*]})--\e[0m" >> $logFile
exit "$1"
else
echo -e "\e[1;31m[`date +%Y-%m-%d` `date +%H:%M:%S`]" \
"--Script exited with ERROR(S) (code: ${exitError[*]})" \
"--\e[0m" >> $logFile
exit "$1"
fi
else else
# exit immediately with error code # exit immediately with error code
# check if there are warnings in addition to errors
if [ ${#exitWarning[@]} -gt 0 ]; then
echo -e "\e[1;31m[`date +%Y-%m-%d` `date +%H:%M:%S`]" >> $logFile
echo -e "\e[1;33m--Script exited with WARNING(S)" \
"(code: ${exitWarning[*]})--" >> $logFile
echo -e "\e[1;31m--Script exited with ERROR (code: $1)" \
"--\e[0m" >> $logFile
else
echo -e "\e[1;31m[`date +%Y-%m-%d` `date +%H:%M:%S`]" \ echo -e "\e[1;31m[`date +%Y-%m-%d` `date +%H:%M:%S`]" \
"--Script exited with ERROR (code: $1)--\e[0m" >> $logFile "--Script exited with ERROR (code: $1)--\e[0m" >> $logFile
exit "$1" exit "$1"
fi
fi fi
} }