aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xandroid-backup18
1 files changed, 13 insertions, 5 deletions
diff --git a/android-backup b/android-backup
index ce36f63..d270ec6 100755
--- a/android-backup
+++ b/android-backup
@@ -101,18 +101,26 @@ function android_backup_backup {
function android_backup_restore {
# Check for previous backups
- if [ ! -e "$STORAGE/$PREVIOUS/files" ]; then
+ if [ -z "$PREVIOUS" ]; then
echo "$BASENAME: no previous backups for device $NAME"
exit 1
fi
# Copy files to workfolder
- mkdir -p $WORK && sudo cp -alf $STORAGE/$PREVIOUS $WORK/android-backup-$NAME-$DATE
+ mkdir -p $WORK && sudo cp -alf $STORAGE/$PREVIOUS $WORK/android-backup-$NAME-$DATE && chown -R `whoami`. android-backup-$NAME-$DATE
+
+ # Check if copy was successful
+ if [ ! -e "$WORK/android-backup-$NAME-$DATE" ]; then
+ echo "$BASENAME: could not copy from $STORAGE/$PREVIOUS"
+ exit 1
+ fi
# Restore each user files
- for USER in $USERS; do
- android_restore_files $USER
- done
+ if [ -e "$WORK/android-backup-$NAME-$DATE" ]; then
+ for USER in $USERS; do
+ android_restore_files $USER
+ done
+ fi
# Configurations
adb restore android-backup-$NAME-$DATE/backup.ab