try to fix the hybbrid definition with all AB configuration (separate product/system_ext or not

dist-font/cm-data/99-font.sh.addon

@@ -9,19 +9,22 @@
 if [ -z $SYSTEM ]; then
   . /tmp/backuptool.functions
   # build missing $PRODUCT and $SYSTEM_EXT from $S
-  PRODUCT="$S/product"
-  SYSTEM_EXT="$S/system_ext"
+  if [ -z $backuptool_ab ]; then
+    SYS=$S
+    PRODUCT="$S/product"
+    SYSTEM_EXT="$S/system_ext"
+    TMP="/tmp"
+  else
+    SYS="/postinstall/$S"
+    PRODUCT="/postinstall/$PRODUCT"
+    SYSTEM_EXT="/postinstall/$SYSTEM_EXT"
+    TMP="/postinstall/tmp"
+  fi
 else
+  # install in recovery, script assume $S and $SYS defined
   S=$SYSTEM
-fi
-if [ -z $backuptool_ab ]; then
-  SYS=$S
-  TMP="/tmp"
-else
-  SYS="/postinstall/$S"
-  PRODUCT="/postinstall/$PRODUCT"
-  SYSTEM_EXT="/postinstall/$SYSTEM_EXT"
-  TMP="/postinstall/tmp"
+  SYS=$SYSTEM
+  # PRODUCT AND SYSTEM_EXT defined from recovery
 fi
 
 # path is needed when running from recovery (at install)

dist-google-more/cm-data/99-perso-google-clean-more.sh.addon

@@ -9,19 +9,22 @@
 if [ -z $SYSTEM ]; then
   . /tmp/backuptool.functions
   # build missing $PRODUCT and $SYSTEM_EXT from $S
-  PRODUCT="$S/product"
-  SYSTEM_EXT="$S/system_ext"
+  if [ -z $backuptool_ab ]; then
+    SYS=$S
+    PRODUCT="$S/product"
+    SYSTEM_EXT="$S/system_ext"
+    TMP="/tmp"
+  else
+    SYS="/postinstall/$S"
+    PRODUCT="/postinstall/$PRODUCT"
+    SYSTEM_EXT="/postinstall/$SYSTEM_EXT"
+    TMP="/postinstall/tmp"
+  fi
 else
+  # install in recovery, script assume $S and $SYS defined
   S=$SYSTEM
-fi
-if [ -z $backuptool_ab ]; then
-  SYS=$S
-  TMP="/tmp"
-else
-  SYS="/postinstall/$S"
-  PRODUCT="/postinstall/$PRODUCT"
-  SYSTEM_EXT="/postinstall/$SYSTEM_EXT"
-  TMP="/postinstall/tmp"
+  SYS=$SYSTEM
+  # PRODUCT AND SYSTEM_EXT defined from recovery
 fi
 
 # path is needed when running from recovery (at install)

dist-google/cm-data/99-perso-google-clean.sh.addon

@@ -9,19 +9,22 @@
 if [ -z $SYSTEM ]; then
   . /tmp/backuptool.functions
   # build missing $PRODUCT and $SYSTEM_EXT from $S
-  PRODUCT="$S/product"
-  SYSTEM_EXT="$S/system_ext"
+  if [ -z $backuptool_ab ]; then
+    SYS=$S
+    PRODUCT="$S/product"
+    SYSTEM_EXT="$S/system_ext"
+    TMP="/tmp"
+  else
+    SYS="/postinstall/$S"
+    PRODUCT="/postinstall/$PRODUCT"
+    SYSTEM_EXT="/postinstall/$SYSTEM_EXT"
+    TMP="/postinstall/tmp"
+  fi
 else
+  # install in recovery, script assume $S and $SYS defined
   S=$SYSTEM
-fi
-if [ -z $backuptool_ab ]; then
-  SYS=$S
-  TMP="/tmp"
-else
-  SYS="/postinstall/$S"
-  PRODUCT="/postinstall/$PRODUCT"
-  SYSTEM_EXT="/postinstall/$SYSTEM_EXT"
-  TMP="/postinstall/tmp"
+  SYS=$SYSTEM
+  # PRODUCT AND SYSTEM_EXT defined from recovery
 fi
 
 # path is needed when running from recovery (at install)

dist-std/cm-data/99-perso.sh.addon

@@ -9,19 +9,22 @@
 if [ -z $SYSTEM ]; then
   . /tmp/backuptool.functions
   # build missing $PRODUCT and $SYSTEM_EXT from $S
-  PRODUCT="$S/product"
-  SYSTEM_EXT="$S/system_ext"
+  if [ -z $backuptool_ab ]; then
+    SYS=$S
+    PRODUCT="$S/product"
+    SYSTEM_EXT="$S/system_ext"
+    TMP="/tmp"
+  else
+    SYS="/postinstall/$S"
+    PRODUCT="/postinstall/$PRODUCT"
+    SYSTEM_EXT="/postinstall/$SYSTEM_EXT"
+    TMP="/postinstall/tmp"
+  fi
 else
+  # install in recovery, script assume $S and $SYS defined
   S=$SYSTEM
-fi
-if [ -z $backuptool_ab ]; then
-  SYS=$S
-  TMP="/tmp"
-else
-  SYS="/postinstall/$S"
-  PRODUCT="/postinstall/$PRODUCT"
-  SYSTEM_EXT="/postinstall/$SYSTEM_EXT"
-  TMP="/postinstall/tmp"
+  SYS=$SYSTEM
+  # PRODUCT AND SYSTEM_EXT defined from recovery
 fi
 
 # path is needed when running from recovery (at install)
@@ -58,6 +61,8 @@ case "$1" in
   post-restore)
     # mute camera
     chmod 000 $SYS/media/audio/ui/camera_*.ogg
+    chmod 000 $PRODUCT/media/audio/ui/camera_*.ogg
+    chmod 000 $PRODUCT/media/audio/ui/Video*.ogg
     # remove bloat
     rm -rf $SYS/priv-app/AudioFX
     rm -rf $SYS/priv-app/CMAccount