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

fixed incorrectly quoted variables causing cmd errors

Browse Source
This commit is contained in:
Asif Bacchus 2019-01-30 11:50:25 -07:00
parent 3b7722ab56
commit ec36c5ca12
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
root/NCscripts/backup.sh
View File

@ -151,7 +151,7 @@ function checkExist {
### ncMaint - pass requested mode change type to NextCloud occ ### ncMaint - pass requested mode change type to NextCloud occ
function ncMaint { function ncMaint {
sudo -u "${webUser}" php "${ncRoot}/occ maintenance:mode" --"$1" \ sudo -u "${webUser}" php "${ncRoot}/occ" maintenance:mode --"$1" \
>> "$logFile" 2>&1 >> "$logFile" 2>&1
maintResult="$?" maintResult="$?"
return "$maintResult" return "$maintResult"
@ -705,7 +705,7 @@ if [ -z "$borgExclude" ]; then
# borgExclude is empty # borgExclude is empty
echo -e "${info}[$(stamp)] --[INFO] Executing borg without exclusions --" \ echo -e "${info}[$(stamp)] --[INFO] Executing borg without exclusions --" \
"${normal}" >> "$logFile" "${normal}" >> "$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"
@ -713,7 +713,7 @@ else
# borgExclude is not empty # borgExclude is not empty
echo -e "${info}[$(stamp)] --[INFO] Executing borg with exclusions --" \ echo -e "${info}[$(stamp)] --[INFO] Executing borg with exclusions --" \
"${normal}" >> "$logFile" "${normal}" >> "$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[@]}" \
"${sqlDumpDir}" "${ncDataDir}" \ "${sqlDumpDir}" "${ncDataDir}" \
@ -741,7 +741,7 @@ if [ -n "$borgPrune" ]; then
# parameters defined # parameters defined
echo -e "${info}[$(stamp)] --[INFO] Executing borg prune operation --" \ echo -e "${info}[$(stamp)] --[INFO] Executing borg prune operation --" \
"${normal}" >> "$logFile" "${normal}" >> "$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
pruneResult="$?" pruneResult="$?"