External-Mirrors/nextcloudpi
2
0
Fork 0
mirror of https://github.com/nextcloud/nextcloudpi.git synced 2026-01-10 15:12:01 -03:30
Code Issues Packages Projects Releases Wiki Activity

ncp-restore: Improve clarity of output regarding data conflicts

Browse Source 
Signed-off-by: Tobias K <6317548+theCalcaholic@users.noreply.github.com>
Signed-off-by: Tobias Knöppler <6317548+theCalcaholic@users.noreply.github.com>
This commit is contained in:
Tobias K 2023-01-07 19:08:13 +01:00 committed by Tobias Knöppler
parent da2dedc450
commit ef4ec175ff
No known key found for this signature in database
GPG Key ID: 3510056072886A8F
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bin/ncp-restore
View File

@ -58,9 +58,12 @@ mv -T "$TMPDIR"/nextcloud "$NCDIR" || { echo "Error restoring base files"; exit
if [[ -n "$DATA_BKP_DIR" ]]
then
echo "Restoring $NCDIR/data..."
target="$NCDIR/data"
[[ -d "$target" ]] && target="$NCDIR/.data_$(date)"
[[ -d "$target" ]] && {
target="$NCDIR/.data_$(date -I)"
echo "DATA CONFLICT! Your old '$NCDIR/data' directory can be found in '$target' after the restore script is done. The new '$NCDIR/data' directory will be restored from the backup."
}
echo "Restoring old '$NCDIR/data' to '$target'..."
mv -T "$DATA_BKP_DIR" "$target"
fi
@ -105,8 +108,8 @@ NUMFILES=2
if [[ $( ls "$TMPDIR" | wc -l ) -eq $NUMFILES ]]; then
[[ -e "$DATADIR" ]] && {
echo "backing up existing $DATADIR to $DATADIR-$( date "+%m-%d-%y" )..."
mv "$DATADIR" "$DATADIR-$( date "+%m-%d-%y" )" || exit 1
echo "backing up existing $DATADIR to $DATADIR-$( date -I )..."
mv "$DATADIR" "$DATADIR-$( date -I )" || exit 1
}
echo "restore datadir to $DATADIR..."