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

503 removal section: use new checkExist 'file not found' code

Browse Source
This commit is contained in:
Asif Bacchus 2018-09-07 01:57:14 -06:00
parent 20435c4e76
commit d518a56027
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
root/scripts/borgbackup.sh
View File

@ -392,18 +392,18 @@ echo -e "\e[1;36m[`date +%Y-%m-%d` `date +%H:%M:%S`] Removing 503 error page" \
rm -f "$webroot/$err503FileName" 2>&1 | tee -a $logFileVerbose $logFileNormal \ rm -f "$webroot/$err503FileName" 2>&1 | tee -a $logFileVerbose $logFileNormal \
> /dev/null > /dev/null
# verify actually removed # verify actually removed
checkExist find "" "$webroot/$err503FileName" checkExist find "$webroot/$err503FileName"
checkResult="$?" checkResult="$?"
if [ "$checkResult" = "0" ]; then if [ "$checkResult" = "3" ]; then
echo -e "\e[0;36m...done\e[0m" | tee -a $logFileVerbose $logFileNormal \
> /dev/null
else
echo -e "\e[1;33m[`date +%Y-%m-%d` `date +%H:%M:%S`] --WARNING:" \ echo -e "\e[1;33m[`date +%Y-%m-%d` `date +%H:%M:%S`] --WARNING:" \
"Problem encountered removing 503 error page from webroot." \ "Problem encountered removing 503 error page from webroot." \
"Manually remove this file or NGINX will not serve web" \ "Manually remove this file or NGINX will not serve web" \
"clients.--" >> $logFile "clients.--" >> $logFile
echo -e "Script will continue processing..." >> $logFileVerbose echo -e "Script will continue processing..." >> $logFileVerbose
exitWarning+=('103') exitWarning+=('103')
else
echo -e "\e[0;36m...done\e[0m" | tee -a $logFileVerbose $logFileNormal \
> /dev/null
fi fi
## Remove sqlDump file ## Remove sqlDump file