Skip to content

Commit bfcf622

Browse files
committed
updater: fix backup creation
1 parent 9cade20 commit bfcf622

1 file changed

Lines changed: 10 additions & 6 deletions

File tree

static/Updater/backup.sh

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,20 @@ BACKUP_LOG="/mnt/SDCARD/Updater/updater.log"
88
export PATH="$(dirname "$0")/bin:$PATH"
99

1010
if [ "$1" = "--restore" ]; then
11-
display -t "Restoring user data..."
12-
1311
BACKUP_TO_RESTORE="$(ls -t /mnt/SDCARD/Saves/QuarkBackup_*.tar.gz | head -1)"
14-
log_message "Updater: restoring backup $BACKUP_TO_RESTORE..."
12+
if [ -z "$BACKUP_TO_RESTORE" ]; then
13+
log_message "Updater: no backup found to restore" "$BACKUP_LOG"
14+
display_msg -d 1500 -t "No backup found to restore"
15+
exit 1
16+
fi
17+
display_msg -t "Restoring user data..."
18+
log_message "Updater: restoring backup $BACKUP_TO_RESTORE..." "$BACKUP_LOG"
1519
sync
1620
if tar xzvf "$BACKUP_TO_RESTORE" -C / >> "$BACKUP_LOG" 2>&1; then
17-
log_message "Updater: successfully restored backup"
21+
log_message "Updater: successfully restored backup" "$BACKUP_LOG"
1822
display_msg -d 1500 -t "Successfully restored user data"
1923
else
20-
log_message "Updater: failed to restore backup"
24+
log_message "Updater: failed to restore backup" "$BACKUP_LOG"
2125
display_msg -d 1500 -t "Failed to restore user data"
2226
fi
2327
else
@@ -36,7 +40,7 @@ else
3640
display_msg -t "Backing up user data..."
3741

3842
if while IFS= read -r f; do [ -e "$f" ] && echo "$f"; done < backup_list.txt | \
39-
tar -czvf "$BACKUP_LOCATION" -T - >> "$BACKUP_LOG" 2>&1; then
43+
tar -cv -T - 2>>"$BACKUP_LOG" | gzip > "$BACKUP_LOCATION"; then
4044
log_message "Updater: successfully backed up files" "$BACKUP_LOG"
4145
display_msg -d 1500 -t "Successfully backed up user data"
4246
else

0 commit comments

Comments
 (0)