commit ae5173834e530087a0f56dec5546d5bd352f3f46
author LuK1337 <priv.luk@gmail.com> Mon Jan 20 16:09:50 2020 +0000
committer Millan Mishra <3ztremors@gmail.com> Wed Jan 29 17:57:23 2020 +0000
tree b842e51cba5d4a215159cb3c63f2a76c83e4468d
parent ef36a58cb4ff1aeeadc7e2edc53f1891445664d8

vendor: Support system-as-root A-only backuptool

Change-Id: Ib4ff7596f492e48ceb68491997584c2206c219ee
Signed-off-by: Millan Mishra <3ztremors@gmail.com>

prebuilt/bin/backuptool.functions

diff --git a/prebuilt/bin/backuptool.functions b/prebuilt/bin/backuptool.functions
index 2734446..ff599f1 100644
--- a/prebuilt/bin/backuptool.functions
+++ b/prebuilt/bin/backuptool.functions
@@ -3,9 +3,6 @@
 # Functions for backuptool.sh
 #
 
-export C=/tmp/backupdir
-export S=/system
-
 DEBUG=0
 
 backup_file() {

prebuilt/bin/backuptool.sh

diff --git a/prebuilt/bin/backuptool.sh b/prebuilt/bin/backuptool.sh
index edf21e5..4e54456 100755
--- a/prebuilt/bin/backuptool.sh
+++ b/prebuilt/bin/backuptool.sh
@@ -4,7 +4,7 @@
 #
 
 export C=/tmp/backupdir
-export S=/system
+export S=$2
 export V=10
 
 export ADDOND_VERSION=1
@@ -15,7 +15,7 @@
 preserve_addon_d() {
   rm -rf /tmp/addon.d/
   mkdir -p /tmp/addon.d/
-  cp -a /system/addon.d/* /tmp/addon.d/
+  cp -a $S/addon.d/* /tmp/addon.d/
     # Discard any scripts that aren't at least our version level
     for f in /postinstall/tmp/addon.d/*sh; do
       SCRIPT_VERSION=$(grep "^# ADDOND_VERSION=" $f | cut -d= -f2)
@@ -31,7 +31,7 @@
 
 # Restore /system/addon.d in /tmp/addon.d
 restore_addon_d() {
-  cp -a /tmp/addon.d/* /system/addon.d/
+  cp -a /tmp/addon.d/* $S/addon.d/
   rm -rf /tmp/addon.d/
 }
 
@@ -49,12 +49,12 @@
 }
 
 check_blacklist() {
-  if [ -f /system/addon.d/blacklist ];then
+  if [ -f $S/addon.d/blacklist ];then
     ## Discard any known bad backup scripts
-    cd /$1/addon.d/
+    cd $1/addon.d/
     for f in *sh; do
       s=$(md5sum $f | awk {'print $1'})
-      grep -q $s /system/addon.d/blacklist && rm -f $f
+      grep -q $s $S/addon.d/blacklist && rm -f $f
     done
   fi
 }
@@ -73,20 +73,20 @@
   backup)
     # make sure we dont start with any leftovers
     rm -rf $C
-    cp /system/bin/backuptool.functions /tmp
-    cp /system/build.prop /tmp
+    cp $S/bin/backuptool.functions /tmp
+    cp $S/build.prop /tmp
     mkdir -p $C
     #check_prereq
-    check_blacklist system
+    check_blacklist $S
     preserve_addon_d
     run_stage pre-backup
     run_stage backup
     run_stage post-backup
   ;;
   restore)
-    cp /system/bin/backuptool.functions /tmp
+    cp $S/bin/backuptool.functions /tmp
     check_prereq
-    check_blacklist tmp
+    check_blacklist /tmp
     run_stage pre-restore
     run_stage restore
     run_stage post-restore