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

Compare commits

base: asif:a2b462c202fd950a2bfb98cfa3e0e4ff1df759d7
Branches Tags
asif:master
asif:NextCloudBackupV1.1
asif:NextCloudBackupV1
..
compare: asif:37449382b2baa94596fdc3ebec15b97fea649108
Branches Tags
asif:master
asif:NextCloudBackupV1.1
asif:NextCloudBackupV1

No commits in common. "a2b462c202fd950a2bfb98cfa3e0e4ff1df759d7" and "37449382b2baa94596fdc3ebec15b97fea649108" have entirely different histories.
a2b462c202 ... 37449382b2

1 changed files with 11 additions and 13 deletions
Show Stats Expand all files Collapse all files

18
root/NCscripts/backup.sh
View File

@ -420,10 +420,8 @@ fi
### Log start of script operations ### Log start of script operations
echo -e "${note}${stamp}--- Start $scriptName execution ---${normal}" \ echo -e "${note}${stamp}-- Start $scriptName execution ---${normal}" \
>> "$logFile" >> "$logFile"
echo -e "${info}${stamp}-- [INFO] Log file located at ${lit}${logFile}${info}" \
"--${normal}" >> "$logFile"
### Export logFile variable for use by Borg ### Export logFile variable for use by Borg
@ -437,7 +435,7 @@ echo -e "${info}${stamp} -- [INFO] mySQL dump file will be stored" \
"at: ${lit}${sqlDumpDir}/${sqlDumpFile}${normal}" >> "$logFile" "at: ${lit}${sqlDumpDir}/${sqlDumpFile}${normal}" >> "$logFile"
### 503 error page: If you don't plan on using the auto-copied 503 then comment ### 503 error page: If you dont' plan on using the auto-copied 503 then comment
### this entire section starting with '--- Begin 503 section ---' until ### this entire section starting with '--- Begin 503 section ---' until
### '--- End 503 section ---' to suppress generated warnings ### '--- End 503 section ---' to suppress generated warnings
@ -694,16 +692,16 @@ export TMPDIR="${BORG_BASE_DIR}/tmp"
# 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 "${info}${stamp} --[INFO] Executing borg without exclusions --" \ echo -e "${bold}${op}${stamp} Executing borg without exclusions${normal}" \
"${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[@]} \
${sqlDumpDir} ${ncDataDir} \ ${sqlDumpDir} ${ncDataDir} \
2>> "$logFile" 2>> "$logFile"
else else
# borgExclude is not empty # borgExclude is not empty
echo -e "${info}${stamp} --[INFO] Executing borg with exclusions --" \ echo -e "${bold}${op}${stamp} Executing borg with exclusions${normal}" \
"${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` \
${xtraFiles[@]} \ ${xtraFiles[@]} \
@ -730,8 +728,8 @@ 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 "${info}${stamp} --[INFO] Executing borg prune operation --" \ echo -e "${bold}${op}${stamp} Executing borg prune operation${normal}" \
"${normal}" >> "$logFile" >> "$logFile"
borg prune --show-rc -v ${borgPruneParams} ${borgPrune} \ borg prune --show-rc -v ${borgPruneParams} ${borgPrune} \
2>> "$logFile" 2>> "$logFile"
# check return-status # check return-status