commit 2d218739a7b52199f0c5fcf213ced623306395a5
author Marko Man <darkobas@gmail.com> Tue Sep 12 02:24:39 2017 +0200
committer Max Weninger <max.weninger@gmail.com> Thu Sep 14 15:01:58 2017 +0200
tree a983b9d37e5b72315206d946372c24e3af4310b6
parent e1aa9ba5ad2cf9a7cbb1b9e55ee17e797ff671a0

vendor: fix backuptool for O

we run the backuptool scripts now right from system
and no longer copy them into /tmp

also add some debug hooks

Change-Id: I7550942e54e0dfbcd5282da7024489428284ceff

prebuilt/bin/backuptool.functions

diff --git a/prebuilt/bin/backuptool.functions b/prebuilt/bin/backuptool.functions
index 1d80a9b..2734446 100644
--- a/prebuilt/bin/backuptool.functions
+++ b/prebuilt/bin/backuptool.functions
@@ -6,16 +6,21 @@
 export C=/tmp/backupdir
 export S=/system
 
+DEBUG=0
+
 backup_file() {
   if [ -e "$1" ]; then
     local F=`basename "$1"`
     local D=`dirname "$1"`
     # dont backup any apps that have odex files, they are useless
     if ( echo "$F" | grep -q "\.apk$" ) && [ -e `echo "$1" | sed -e 's/\.apk$/\.odex/'` ]; then
-      echo "Skipping odexed apk $1";
+      echo "Skipping odexed apk $1"
     else
       mkdir -p "$C/$D"
-      cp -p $1 "$C/$D/$F"
+      cp -p "$1" "$C/$D/$F"
+      if [ $DEBUG -eq 1 ]; then 
+        echo backup_file "$1" "$C/$D/$F"
+      fi
     fi
   fi
 }
@@ -25,12 +30,15 @@
   local DIR=`dirname "$1"`
   if [ -e "$C/$DIR/$FILE" ]; then
     if [ ! -d "$DIR" ]; then
-      mkdir -p "$DIR";
+      mkdir -p "$DIR"
     fi
-    cp -p "$C/$DIR/$FILE" "$1";
+    cp -p "$C/$DIR/$FILE" "$1"
+    if [ $DEBUG -eq 1 ]; then 
+      echo restore_file "$C/$DIR/$FILE" "$1"
+    fi
     if [ -n "$2" ]; then
       echo "Deleting obsolete file $2"
-      rm "$2";
+      rm "$2"
     fi
   fi
 }

prebuilt/bin/backuptool.sh

diff --git a/prebuilt/bin/backuptool.sh b/prebuilt/bin/backuptool.sh
index ce3627f..dd71112 100755
--- a/prebuilt/bin/backuptool.sh
+++ b/prebuilt/bin/backuptool.sh
@@ -7,6 +7,8 @@
 export S=/system
 export V=8.0
 
+DEBUG=0
+
 # Preserve /system/addon.d in /tmp/addon.d
 preserve_addon_d() {
   mkdir -p /tmp/addon.d/
@@ -42,12 +44,16 @@
 # Execute /system/addon.d/*.sh scripts with $1 parameter
 run_stage() {
 for script in $(find /tmp/addon.d/ -name '*.sh' |sort -n); do
+  if [ $DEBUG -eq 1 ]; then 
+      echo run_stage $script $1
+  fi
   $script $1
 done
 }
 
 case "$1" in
   backup)
+    cp /system/bin/backuptool.functions /tmp
     mkdir -p $C
     check_prereq
     check_blacklist system
@@ -57,6 +63,7 @@
     run_stage post-backup
   ;;
   restore)
+    cp /system/bin/backuptool.functions /tmp
     check_prereq
     check_blacklist tmp
     run_stage pre-restore