From 11cbdea0e988fa7b4fd9c80371cd32e8848147f8 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <pierre-hugues.husson@softathome.com>
Date: Mon, 14 May 2018 13:34:52 +0200
Subject: [PATCH] Refactor fixSPL to prevent early exit

---
 rw-system.sh | 66 ++++++++++++++++++++++++++++------------------------
 1 file changed, 36 insertions(+), 30 deletions(-)

diff --git a/rw-system.sh b/rw-system.sh
index 3cfb4ed..58640fd 100644
--- a/rw-system.sh
+++ b/rw-system.sh
@@ -2,6 +2,39 @@
 
 set -e
 
+fixSPL() {
+    img="$(find /dev/block -type l |grep by-name |grep /kernel$(getprop ro.boot.slot_suffix) |head -n 1)"
+    [ -z "$img" ] && img="$(find /dev/block -type l |grep by-name |grep /boot$(getprop ro.boot.slot_suffix) |head -n 1)"
+    if [ -n "$img" ];then
+        #Rewrite SPL/Android version if needed
+        Arelease="$(getSPL $img android)"
+        setprop ro.keymaster.xxx.release $Arelease
+        setprop ro.keymaster.xxx.security_patch "$(getSPL $img spl)"
+
+        #Only Android 8.0 needs this
+        if ! echo "$Arelease" |grep -qF 8.0;then
+            return 0
+        fi
+
+        for f in /vendor/lib64/hw/android.hardware.keymaster@3.0-impl-qti.so /system/lib64/vndk-26/libsoftkeymasterdevice.so;do
+            [ ! -f $f ] && continue
+            b="$(basename "$f")"
+
+            mkdir -p /dev/phh/
+            cp $f /dev/phh/$b
+            sed -i -e 's/ro.build.version.release/ro.keymaster.xxx.release/g' -e 's/ro.build.version.security_patch/ro.keymaster.xxx.security_patch/g' /dev/phh/$b
+            if echo $f |grep vendor;then
+                chcon u:object_r:vendor_file:s0 /dev/phh/$b
+            else
+                chcon u:object_r:system_file:s0 /dev/phh/$b
+            fi
+            chmod 0644 /dev/phh/$b
+            mount -o bind /dev/phh/$b $f
+        done
+        setprop ctl.restart keymaster-3-0
+    fi
+}
+
 if mount -o remount,rw /system;then
 	resize2fs $(grep ' /system ' /proc/mounts |cut -d ' ' -f 1)
 elif mount -o remount,rw /;then
@@ -10,37 +43,10 @@ fi
 mount -o remount,ro /system
 mount -o remount,ro /
 
-img="$(find /dev/block -type l |grep by-name |grep /kernel$(getprop ro.boot.slot_suffix) |head -n 1)"
-[ -z "$img" ] && img="$(find /dev/block -type l |grep by-name |grep /boot$(getprop ro.boot.slot_suffix) |head -n 1)"
-if [ -n "$img" ];then
-    #Rewrite SPL/Android version if needed
-    Arelease="$(getSPL $img android)"
-    setprop ro.keymaster.xxx.release $Arelease
-    setprop ro.keymaster.xxx.security_patch "$(getSPL $img spl)"
-
-    #Only Android 8.0 needs this
-    if ! echo "$Arelease" |grep -qF 8.0;then
-        exit 0
-    fi
-
-    for f in /vendor/lib64/hw/android.hardware.keymaster@3.0-impl-qti.so /system/lib64/vndk-26/libsoftkeymasterdevice.so;do
-        [ ! -f $f ] && continue
-        b="$(basename "$f")"
-
-        mkdir -p /dev/phh/
-        cp $f /dev/phh/$b
-        sed -i -e 's/ro.build.version.release/ro.keymaster.xxx.release/g' -e 's/ro.build.version.security_patch/ro.keymaster.xxx.security_patch/g' /dev/phh/$b
-        if echo $f |grep vendor;then
-            chcon u:object_r:vendor_file:s0 /dev/phh/$b
-        else
-            chcon u:object_r:system_file:s0 /dev/phh/$b
-        fi
-        chmod 0644 /dev/phh/$b
-        mount -o bind /dev/phh/$b $f
-    done
-    setprop ctl.restart keymaster-3-0
-fi
+fixSPL
 
 if grep vendor.huawei.hardware.biometrics.fingerprint /vendor/manifest.xml;then
     mount -o bind system/phh/huawei/fingerprint.kl /vendor/usr/keylayout/fingerprint.kl
 fi
+
+