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

Changed borg operations logging format to bold

Browse Source
This commit is contained in:
Asif Bacchus 2018-10-14 15:40:43 -06:00
parent c9febf9b08
commit 2d3a19db31
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
backup.sh
View File

@ -189,6 +189,7 @@ errorExplain[210]="Invalid or non-existant borg base directory specified (borg b
errorExplain[211]="Invalid or non-existant path to borg SSH keyfile (borg backup details file)" errorExplain[211]="Invalid or non-existant path to borg SSH keyfile (borg backup details file)"
errorExplain[212]="Name of borg repo was not specified (borg backup details file)" errorExplain[212]="Name of borg repo was not specified (borg backup details file)"
errorExplain[220]="Borg exited with a critical error. Please check this script's logfile for details" errorExplain[220]="Borg exited with a critical error. Please check this script's logfile for details"
errorExplain[221]="Borg prune exited with ERRORS. Please check this script's logfile for details"
### Warning codes & messages ### Warning codes & messages
warningExplain[111]="Could not remove SQL dump file and directory, please remove manually" warningExplain[111]="Could not remove SQL dump file and directory, please remove manually"
@ -205,7 +206,6 @@ warningExplain[2115]="No paramters provided for borg prune. No repo pruning has
warningExplain[2200]="Borg completed with warnings. Please check this script's logfile for details" warningExplain[2200]="Borg completed with warnings. Please check this script's logfile for details"
warningExplain[2201]="Borg exited with an unknown return-code. Please check this script's logfile for details" warningExplain[2201]="Borg exited with an unknown return-code. Please check this script's logfile for details"
warningExplain[2210]="Borg prune exited with warnings. Please check this script's logfile for details" warningExplain[2210]="Borg prune exited with warnings. Please check this script's logfile for details"
warningExplain[2211]="Borg prune exited with ERRORS. Please check this script's logfile for details"
warningExplain[2212]="Borg prune exited with an unknown return-code. Please check this script's logfile for details" warningExplain[2212]="Borg prune exited with an unknown return-code. Please check this script's logfile for details"
@ -557,7 +557,7 @@ fi
# commandline depends on whether borgExclude is empty or not # commandline depends on whether borgExclude is empty or not
if [ -z "$borgExclude" ]; then if [ -z "$borgExclude" ]; then
# borgExclude is empty # borgExclude is empty
echo -e "${op}${stamp} Executing borg without exclusions${normal}" \ echo -e "${bold}${op}${stamp} Executing borg without exclusions${normal}" \
>> "$logFile" >> "$logFile"
borg --show-rc create ${borgCreateParams} ::`date +%Y-%m-%d_%H%M%S` \ borg --show-rc create ${borgCreateParams} ::`date +%Y-%m-%d_%H%M%S` \
"${xtraFiles[@]}" \ "${xtraFiles[@]}" \
@ -565,7 +565,7 @@ if [ -z "$borgExclude" ]; then
2>> "$logFile" 2>> "$logFile"
else else
# borgExclude is not empty # borgExclude is not empty
echo -e "${op}${stamp} Executing borg with exclusions${normal}" \ echo -e "${bold}${op}${stamp} Executing borg with exclusions${normal}" \
>> "$logFile" >> "$logFile"
borg --show-rc create ${borgCreateParams} --exclude-from "${borgExclude}" \ borg --show-rc create ${borgCreateParams} --exclude-from "${borgExclude}" \
::`date +%Y-%m-%d_%H%M%S` \ ::`date +%Y-%m-%d_%H%M%S` \
@ -593,7 +593,7 @@ fi
# command depends on whether or not parameters have been defined # command depends on whether or not parameters have been defined
if [ -n "$borgPrune" ]; then if [ -n "$borgPrune" ]; then
# parameters defined # parameters defined
echo -e "${op}${stamp} Executing borg prune operation${normal}" \ echo -e "${bold}${op}${stamp} Executing borg prune operation${normal}" \
>> "$logFile" >> "$logFile"
borg --show-rc prune -v ${borgPruneParams} "${borgPrune}" \ borg --show-rc prune -v ${borgPruneParams} "${borgPrune}" \
2>> "$logFile" 2>> "$logFile"
@ -605,7 +605,7 @@ if [ -n "$borgPrune" ]; then
elif [ "$pruneResult" -eq 1 ]; then elif [ "$pruneResult" -eq 1 ]; then
exitWarn+=('2210') exitWarn+=('2210')
elif [ "$pruneResult" -ge 2 ]; then elif [ "$pruneResult" -ge 2 ]; then
exitWarn+=('2211') exitError+=('221')
else else
exitWarn+=('2212') exitWarn+=('2212')
fi fi