3 Commits

Author SHA1 Message Date
Asif Bacchus 8efaed6bb7 fixed incorrect spacing after stamp to resolve logwatch errs 2019-01-30 11:57:10 -07:00
Asif Bacchus ec36c5ca12 fixed incorrectly quoted variables causing cmd errors 2019-01-30 11:50:25 -07:00
Asif Bacchus 3b7722ab56 quoted all variable expansions to handle spaces properly 2019-01-30 10:13:36 -07:00
+8 -8
View File
@@ -151,7 +151,7 @@ function checkExist {
### ncMaint - pass requested mode change type to NextCloud occ
function ncMaint {
sudo -u ${webUser} php ${ncRoot}/occ maintenance:mode --$1 \
sudo -u "${webUser}" php "${ncRoot}/occ" maintenance:mode --"$1" \
>> "$logFile" 2>&1
maintResult="$?"
return "$maintResult"
@@ -381,8 +381,8 @@ if [ -z "$webUser" ]; then
exit 1
# Check if supplied webUser account exists
elif [ -n "$webUser" ]; then
user_exists=$(id -u $webUser > /dev/null 2>&1; echo $?)
if [ $user_exists -ne 0 ]; then
user_exists=$(id -u "$webUser" > /dev/null 2>&1; echo $?)
if [ "$user_exists" -ne 0 ]; then
echo -e "\n${err}The supplied webuser account (-u parameter) does not" \
"exist.${normal}\n"
exit 1
@@ -706,17 +706,17 @@ if [ -z "$borgExclude" ]; then
echo -e "${info}[$(stamp)] --[INFO] Executing borg without exclusions --" \
"${normal}" >> "$logFile"
borg --show-rc create ${borgCreateParams} ::`date +%Y-%m-%d_%H%M%S` \
${xtraFiles[@]} \
${sqlDumpDir} ${ncDataDir} \
"${xtraFiles[@]}" \
"${sqlDumpDir}" "${ncDataDir}" \
2>> "$logFile"
else
# borgExclude is not empty
echo -e "${info}[$(stamp)] --[INFO] Executing borg with exclusions --" \
"${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` \
${xtraFiles[@]} \
${sqlDumpDir} ${ncDataDir} \
"${xtraFiles[@]}" \
"${sqlDumpDir}" "${ncDataDir}" \
2>> "$logFile"
fi