Merge branch 'restore-in-mem'

1 files changed, 5 insertions, 12 deletions

diff --git a/andbackup.sh b/andbackup.sh
index 86fdefa..e8bbae8 100755
--- a/andbackup.sh
+++ b/andbackup.sh
@@ -227,24 +227,17 @@ restore_app() {
 
   # Get pertinent metadata
   local owner=$(dumpsys package ${app} | grep userId | cut -d'=' -f2 | head -n1)
-  local code=$(dumpsys package ${app} | grep codePath | cut -d'=' -f2 | head -n1)
-  local data=$(dumpsys package ${app} | grep dataDir  | cut -d'=' -f2 | head -n1)
+  local data="/data/data/${app}"
 
-  # Decompress backup
+  # Decompress data backup
   linfo "Decompressing user data for ${app}."
-  cd ${backups}/${app}/
-  gzip -d -c data.tar.gz | tar -x
+  gzip -d -c ${backups}/${app}/data.tar.gz | tar -x -C "${data}"
 
-  # Copy the user data in
-  cp -rp ${backups}/${app}/data/* ${data}/
   # Fix data permissions
-  chown -R ${owner}:${owner} ${data}
+  chown -R ${owner}:${owner} "${data}"
   # Fix selinux labels
   linfo "Restoring SELinux contexs for ${app}"
-  restorecon -R ${data} 2>/dev/null
-
-  # Cleanup the extracted data so restores don't take too much space
-  rm -rf ${backups}/${app}/data
+  restorecon -R "${data}" 2>/dev/null
 }