rework script so that it’s not broken by lineage backuptools_ab.sh

It do sed on script, that break my test:
https://github.com/LineageOS/android_vendor_lineage/blob/lineage-16.0/prebuilt/common/bin/backuptool_ab.sh#L98

diff --git a/dist-google-more/cm-data/99-perso-google-clean-more.sh.addon b/dist-google-more/cm-data/99-perso-google-clean-more.sh.addon
index 3a05e70468305f554e00f6942f6681ec71afdefa..c803253a8507b910f40d0bc2b39170cd2173a034 100755 (executable)
--- a/dist-google-more/cm-data/99-perso-google-clean-more.sh.addon
+++ b/dist-google-more/cm-data/99-perso-google-clean-more.sh.addon
@@ -5,14 +5,9 @@
 # /system/addon.d/99-perso-google-clean-more.sh
 #
 
-# we partially use the script at install, we need to have some fallback
-# if backuptool functions are not present
-if [ -e /tmp/backuptool.functions ]; then
+# we partially use the script at install, if so, $S is allready defined
+if [ -z $S ]; then
   . /tmp/backuptool.functions
-elif [ -z $S ]; then
-  echo "$S should be defined by the caller"
-else
-  echo "S=$S"
 fi
 if [ -z $backuptool_ab ]; then
   SYS=$S

diff --git a/dist-google/cm-data/99-perso-google-clean.sh.addon b/dist-google/cm-data/99-perso-google-clean.sh.addon
index 1a9a9b1b1bbca20901c80bed22c73d31657354d9..cb598e4e2f2afa01bad6b6a27954cc90b6fa93f8 100755 (executable)
--- a/dist-google/cm-data/99-perso-google-clean.sh.addon
+++ b/dist-google/cm-data/99-perso-google-clean.sh.addon
@@ -5,14 +5,9 @@
 # /system/addon.d/99-perso-google-clean.sh
 #
 
-# we partially use the script at install, we need to have some fallback
-# if backuptool functions are not present
-if [ -e /tmp/backuptool.functions ]; then
+# we partially use the script at install, if so, $S is allready defined
+if [ -z $S ]; then
   . /tmp/backuptool.functions
-elif [ -z $S ]; then
-  echo "$S should be defined by the caller"
-else
-  echo "S=$S"
 fi
 if [ -z $backuptool_ab ]; then
   SYS=$S

diff --git a/dist-std/cm-data/99-perso.sh.addon b/dist-std/cm-data/99-perso.sh.addon
index 02a83f34c654b80b149f8b4fd75108d4ff9adf0f..6513486597b827943aa43b33260594a5fc9ad41a 100755 (executable)
--- a/dist-std/cm-data/99-perso.sh.addon
+++ b/dist-std/cm-data/99-perso.sh.addon
@@ -5,14 +5,9 @@
 # /system/addon.d/99-perso.sh
 #
 
-# we partially use the script at install, we need to have some fallback
-# if backuptool functions are not present
-if [ -e /tmp/backuptool.functions ]; then
+# we partially use the script at install, if so, $S is allready defined
+if [ -z $S ]; then
   . /tmp/backuptool.functions
-elif [ -z $S ]; then
-  echo "$S should be defined by the caller"
-else
-  echo "S=$S"
 fi
 if [ -z $backuptool_ab ]; then
   SYS=$S