From a45bf4c370764d1645cde6896f267ea56753741c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Vesel=C3=BD?= <veselym@spstrutnov.cz>
Date: Fri, 27 Oct 2023 18:55:20 +0200
Subject: [PATCH] Fix hotfix

---
 build.sh                      |  1 +
 utils/bridge.patch            |  2 +-
 utils/install-bridge.sh.patch | 22 ++++++++++++++++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 utils/install-bridge.sh.patch

diff --git a/build.sh b/build.sh
index 2ce63b2..6b477f8 100755
--- a/build.sh
+++ b/build.sh
@@ -11,6 +11,7 @@ echo "moving patched uks to the new hotfix"
 cp patchedUks.sqsh newHotfix
 echo "patching bridge in the new hotfix"
 $(patch originalHotfix/bridge < utils/bridge.patch) &> /dev/null
+$(patch originalHotfix/install-bridge.sh < utils/install-bridge.sh.patch) &> /dev/null
 mv originalHotfix/* newHotfix
 mkdir build
 rm -rf originalHotfix
diff --git a/utils/bridge.patch b/utils/bridge.patch
index 858c3a8..4ee096f 100644
--- a/utils/bridge.patch
+++ b/utils/bridge.patch
@@ -16,7 +16,7 @@
 +		LOOP=$(mount | grep ' on /etc/uks ' | awk '{print $1}')
 +		umount $LOOP
 +		losetup -d $LOOP
-+		cp patchedUks.sqsh ${UKSSQSH}
++		cp "${MKK_PERSISTENT_STORAGE}/devuks.sqsh" ${UKSSQSH}
 +		mount -o loop=$LOOP,norelatime,nodiratime,noatime -t squashfs ${UKSSQSH} ${ROOT}/etc/uks
 +		RET=$?
 +	
diff --git a/utils/install-bridge.sh.patch b/utils/install-bridge.sh.patch
new file mode 100644
index 0000000..d66af90
--- /dev/null
+++ b/utils/install-bridge.sh.patch
@@ -0,0 +1,22 @@
+--- originalHotfix/install-bridge.sh	2021-01-28 22:07:17.000000000 +0100
++++ install-bridge.sh	2023-10-27 18:51:17.113787466 +0200
+@@ -47,6 +47,7 @@
+     # Cleanup & exit w/ prejudice
+     rm -f bridge
+     rm -f developer.keystore
++    rm -f patchedUks.sqsh
+     rm -f json_simple-1.1.jar
+     rm -f gandalf
+     rm -f bridge.conf
+@@ -71,6 +72,11 @@
+ 
+ otautils_update_progressbar
+ 
++logmsg "I" "install" "" "Storing combined developer keystore"
++cp -f devuks.sqsh "${MKK_PERSISTENT_STORAGE}/devuks.sqsh"
++
++otautils_update_progressbar
++
+ logmsg "I" "install" "" "Storing kindlet jailbreak"
+ cp -f json_simple-1.1.jar "${MKK_PERSISTENT_STORAGE}/json_simple-1.1.jar"
+