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

quoted all variable expansions to handle spaces properly

Browse Source
This commit is contained in:
Asif Bacchus 2019-01-30 10:13:36 -07:00
parent 26c5fc1f4f
commit 3b7722ab56
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
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"
@ -381,8 +381,8 @@ if [ -z "$webUser" ]; then
exit 1 exit 1
# Check if supplied webUser account exists # Check if supplied webUser account exists
elif [ -n "$webUser" ]; then elif [ -n "$webUser" ]; then
user_exists=$(id -u $webUser > /dev/null 2>&1; echo $?) user_exists=$(id -u "$webUser" > /dev/null 2>&1; echo $?)
if [ $user_exists -ne 0 ]; then if [ "$user_exists" -ne 0 ]; then
echo -e "\n${err}The supplied webuser account (-u parameter) does not" \ echo -e "\n${err}The supplied webuser account (-u parameter) does not" \
"exist.${normal}\n" "exist.${normal}\n"
exit 1 exit 1
@ -705,18 +705,18 @@ 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"
else 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}" \
2>> "$logFile" 2>> "$logFile"
fi fi
@ -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="$?"