backup/backup-rcopy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some errors syncunf nextclud accounts..

Browse Source
This commit is contained in:
root
2020-11-19 18:46:54 +01:00
parent 8477b08aee
commit 2c54e20d04
4 changed files with 67 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
hosts/scripts/main_part.include
View File

@ -354,42 +354,6 @@ if [ "$found" = "true" -o "$pgsql_backup" = "true" -o "$mysql_backup" = "true"
done
fi
if $nextcloud_backup ; then
declare -a nextcloud_account_arr
for _account in $nextcloud_accounts ; do
nextcloud_account_arr+=("$_account")
done
echolog "\nGoing to backup nextcloud accounts.. ( $(date +%H): $($date +%M) h)"
for _val in "${nextcloud_account_arr[@]}" ; do
IFS=';' read -a _val_arr <<< "${_val}"
if [[ "${#_val_arr[@]}" -eq 3 ]] ; then
_server_url="${_val_arr[2]}"
else
_server_url="$nextcloud_server_url"
fi
_server_name="${_server_url#http://}"
_server_name="${_server_name#https://}"
#echo ""
#echo "#_val_arr[@]: ${#_val_arr[@]}"
#echo "_val_arr[0]: ${_val_arr[0]}"
#echo "_val_arr[1]: ${_val_arr[1]}"
#echo "_val_arr[2]: ${_val_arr[2]}"
#echo "_val_arr[3]: ${_val_arr[3]}"
#echo ""
echolog "\n\tBackup nextcloud account '${_val_arr[0]}' from server '$_server_name'"
nc_server_url="$_server_url" \
nc_server_name="$_server_name" \
nc_user="${_val_arr[0]}" \
nc_password="${_val_arr[1]}" \
${script_dir}/nc_accounts_backup.sh
done
fi
if [[ -n "$post_backup_commands" ]]; then
echolog "\nGoing to execute post backup commands.."
@ -410,6 +374,43 @@ if [ "$found" = "true" -o "$pgsql_backup" = "true" -o "$mysql_backup" = "true"
done
fi
if $nextcloud_backup ; then
declare -a nextcloud_account_arr
# - Splitt on newlines
# -
# - Use: IFS=$'\n'
# -
IFS=$'\n' ; for _account in $nextcloud_accounts ; do
nextcloud_account_arr+=("$(trim $_account)");
done
echolog "\nGoing to backup nextcloud accounts.. ( $(date +%H): $($date +%M) h)"
for _val in "${nextcloud_account_arr[@]}" ; do
# - Note: Field delemeter is the backtick sign '`'
# -
IFS='`' read -a _val_arr <<< "${_val}"
if [[ "${#_val_arr[@]}" -eq 3 ]] ; then
_server_url="${_val_arr[2]}"
else
_server_url="$nextcloud_server_url"
fi
_server_name="${_server_url#http://}"
_server_name="${_server_name#https://}"
echolog "\n\tBackup nextcloud account '${_val_arr[0]}' from server '$_server_name'"
nc_server_url="$_server_url" \
nc_server_name="$_server_name" \
nc_user="${_val_arr[0]}" \
nc_password="${_val_arr[1]}" \
${script_dir}/nc_accounts_backup.sh
done
fi
fi # if $NO_NEW_BACKUP
end_h=`$date +%H`