Added post-restore cleanup and small message fixes

Was extracting data to be restored, but left the extracted version
there, taking much space sometimes. This cleans up the data directory
after the restore has completed.

Also updated a few messages to make them more unified.

1 files changed, 6 insertions, 2 deletions

diff --git a/andbackup.sh b/andbackup.sh
index 01ffedb..d68fc23 100755
--- a/andbackup.sh
+++ b/andbackup.sh
@@ -36,7 +36,7 @@ function backup_app {
     return 1
   fi
 
-  echo "# Backing up ${app}"
+  echo "Backing up ${app}"
 
   # Stop the application if it is running
   am force-stop ${app}
@@ -96,7 +96,7 @@ function restore_app {
     return 1
   fi
 
-  echo "# Restoring ${app}"
+  echo "Restoring ${app}"
 
   # Install app if it is not yet installed
   if [[ ! -f "${backups}/${app}/base.apk" ]]; then
@@ -123,6 +123,9 @@ function restore_app {
   cp -rp ${backups}/${app}/data/* ${data}/
   # Fix data permissions
   chown -R ${owner}:${owner} ${data}
+
+  # Cleanup the extracted data so restores don't take too much space
+  rm -rf ${backups}/${app}/data
 }
 
 
@@ -145,6 +148,7 @@ function restore_apps {
   done
 }
 
+
 function list_backup_apps {
   local list=${1:-}
   [[ -z ${list} ]] && echo "A backup list is required." && return 1