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

ncp-restore: Use second-accurate timestamps for temporary and backup directories

Browse Source 
Signed-off-by: Tobias K <6317548+theCalcaholic@users.noreply.github.com>
This commit is contained in:
Tobias K 2023-05-01 14:02:50 +02:00
parent c5698e1d8e
commit 31a9ab81f8
No known key found for this signature in database
GPG Key ID: 44FD368932E645C1
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bin/ncp-restore
View File

@ -60,7 +60,7 @@ if [[ -n "$DATA_BKP_DIR" ]]
then
target="$NCDIR/data"
[[ -d "$target" ]] && {
target="$NCDIR/.data_$(date -I)"
target="$NCDIR/.data_$(date '+%FT%s')"
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. You can manually merge these directories with this command (run nc-fix-permissions and nc-scan afterwards): cp -rn '$target/'* '$target/'.[!.]* '$NCDIR/data/'"
}
echo "Restoring old '$NCDIR/data' to '$target'..."
@ -108,8 +108,9 @@ NUMFILES=2
if [[ $( ls "$TMPDIR" | wc -l ) -eq $NUMFILES ]]; then
[[ -e "$DATADIR" ]] && {
echo "backing up existing $DATADIR to $DATADIR-$( date -I )..."
mv "$DATADIR" "$DATADIR-$( date -I )" || exit 1
bk_target="$DATADIR-$( date '+%FT%s' )"
echo "backing up existing $DATADIR to ${bk_target}..."
mv "$DATADIR" "${bk_target}" || exit 1
}
echo "restore datadir to $DATADIR..."