AK3+Backend: mount and output fixes

- fix case where TWRP has /system_root mountpoint but ROM is non-SAR
- fix regression in ui_print when final character is \

2 files changed, 9 insertions, 3 deletions

diff --git a/META-INF/com/google/android/update-binary b/META-INF/com/google/android/update-binary
index 01a62af..21435dd 100755
--- a/META-INF/com/google/android/update-binary
+++ b/META-INF/com/google/android/update-binary
@@ -16,7 +16,8 @@ test "$ANDROID_ROOT" || ANDROID_ROOT=/system;
 
 ui_print() {
   until [ ! "$1" ]; do
-    echo -e "ui_print $1\nui_print" > $OUTFD;
+    echo "ui_print $1
+      ui_print" > $OUTFD;
     shift;
   done;
 }
@@ -113,7 +114,11 @@ mount_all() {
     ;;
   esac;
   if is_mounted /system_root; then
-    $BB mount -o bind /system_root/system /system;
+    if [ -f /system_root/build.prop ]; then
+      $BB mount -o bind /system_root /system;
+    else
+      $BB mount -o bind /system_root/system /system;
+    fi;
   fi;
   $BOOTMODE || mount_apex;
 }
diff --git a/tools/ak3-core.sh b/tools/ak3-core.sh
index b9d238f..6d60158 100755
--- a/tools/ak3-core.sh
+++ b/tools/ak3-core.sh
@@ -15,7 +15,8 @@ split_img=$home/split_img;
 # ui_print "<text>" [...]
 ui_print() {
   until [ ! "$1" ]; do
-    echo -e "ui_print $1\nui_print" > /proc/self/fd/$OUTFD;
+    echo -e "ui_print $1
+      ui_print" > /proc/self/fd/$OUTFD;
     shift;
   done;
 }