Fixes for android-restore

diff --git a/android-backup b/android-backup
index ce36f6359b45170d865f1d7c7480567c9211a034..d270ec62b8f4d16426929c259a821820dc63d308 100755 (executable)
--- 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