From e87ce1147d2e828ad413c9fad5492b2bf6e9a574 Mon Sep 17 00:00:00 2001
From: Charlie Root <charlie@charlieroot.dev>
Date: Wed, 9 Apr 2025 21:46:47 +0200
Subject: [PATCH] winterbreak/jb.sh: fix formatting; remove undefined keywords

Makes the current formatting a bit nicer, also does the following things:

- removes the `local` keyrword. This is undefined in POSIX sh.
- adds double quotes around some expressions to avoid word splitting
- changes the `==` equality operator to `=`, since `==` is
also not supported by POSIX sh.
---
 winterbreak/jb.sh | 118 +++++++++++++++++++++-------------------------
 1 file changed, 53 insertions(+), 65 deletions(-)

diff --git a/winterbreak/jb.sh b/winterbreak/jb.sh
index 9f874e0..dc7325c 100644
--- a/winterbreak/jb.sh
+++ b/winterbreak/jb.sh
@@ -8,68 +8,60 @@
 #
 ##
 
-
-
 set +e # If boot is halted stuff seriously goes wrong (actually we don't need this anymore but I'm keeping it)
 
-
 ###
 # Define logging function
 ###
 POS=1
 wb_log() {
-  echo "${1}" >> /mnt/us/winterbreak.log
+  echo "${1}" >>/mnt/us/winterbreak.log
   eips 0 $POS "${1}"
   echo "${1}"
-  POS=$((POS+1))
+  POS=$((POS + 1))
 }
 
 ###
 # Prevents potential bootloop for people who didn't properly remove the beta (from when it was called MountSus)
 ###
 if [ -f /var/local/root/mntus.params ]; then
-  if [ $(grep -i "/mnt/us/JB.sh" "/var/local/root/mntus.params") != "" ] ; then
+  if [ "$(grep -i "/mnt/us/JB.sh" "/var/local/root/mntus.params")" != "" ]; then
     wb_log "ERROR: MountSus Detected - exiting"
     exit 0 # The jailbreak has already been run before
   fi
 fi
 
 if [ -f /var/local/system/mntus.params ]; then
-  if [ $(grep -i "/mnt/us/JB.sh" "/var/local/system/mntus.params") != "" ] ; then # Just in case!
-      wb_log "ERROR: MountSus Detected - exiting"
-      exit 0 # The jailbreak has already been run before
+  if [ "$(grep -i "/mnt/us/JB.sh" "/var/local/system/mntus.params")" != "" ]; then # Just in case!
+    wb_log "ERROR: MountSus Detected - exiting"
+    exit 0 # The jailbreak has already been run before
   fi
 fi
 
-
-
 ###
 # Helper functions
 ###
 make_mutable() {
-        local my_path="${1}"
-        # NOTE: Can't do that on symlinks, hence the hoop-jumping...
-        if [ -d "${my_path}" ] ; then
-                find "${my_path}" -type d -exec chattr -i '{}' \;
-                find "${my_path}" -type f -exec chattr -i '{}' \;
-        elif [ -f "${my_path}" ] ; then
-                chattr -i "${my_path}"
-        fi
+  my_path="${1}"
+  # NOTE: Can't do that on symlinks, hence the hoop-jumping...
+  if [ -d "${my_path}" ]; then
+    find "${my_path}" -type d -exec chattr -i '{}' \;
+    find "${my_path}" -type f -exec chattr -i '{}' \;
+  elif [ -f "${my_path}" ]; then
+    chattr -i "${my_path}"
+  fi
 }
 
 make_immutable() {
-        local my_path="${1}"
-        if [ -d "${my_path}" ] ; then
-                find "${my_path}" -type d -exec chattr +i '{}' \;
-                find "${my_path}" -type f -exec chattr +i '{}' \;
-        elif [ -f "${my_path}" ] ; then
-                chattr +i "${my_path}"
-        fi
+  my_path="${1}"
+  if [ -d "${my_path}" ]; then
+    find "${my_path}" -type d -exec chattr +i '{}' \;
+    find "${my_path}" -type f -exec chattr +i '{}' \;
+  elif [ -f "${my_path}" ]; then
+    chattr +i "${my_path}"
+  fi
 }
 
-
-
-
 ###
 # Actual JB from here
 ###
@@ -90,16 +82,14 @@ wb_log "- Isaac Asimov"
 wb_log ""
 wb_log ""
 
-
 ###
 # Main key install functions
 ###
-install_touch_update_key()
-{
-        wb_log "install_touch_update_key - Copying the jailbreak updater key"
-        make_mutable "/etc/uks/pubdevkey01.pem"
-        rm -rf "/etc/uks/pubdevkey01.pem"
-        cat > "/etc/uks/pubdevkey01.pem" << EOF
+install_touch_update_key() {
+  wb_log "install_touch_update_key - Copying the jailbreak updater key"
+  make_mutable "/etc/uks/pubdevkey01.pem"
+  rm -rf "/etc/uks/pubdevkey01.pem"
+  cat >"/etc/uks/pubdevkey01.pem" <<EOF
 -----BEGIN PUBLIC KEY-----
 MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDJn1jWU+xxVv/eRKfCPR9e47lP
 WN2rH33z9QbfnqmCxBRLP6mMjGy6APyycQXg3nPi5fcb75alZo+Oh012HpMe9Lnp
@@ -107,36 +97,35 @@ eEgloIdm1E4LOsyrz4kttQtGRlzCErmBGt6+cAVEV86y2phOJ3mLk0Ek9UQXbIUf
 rvyJnS2MKLG2cczjlQIDAQAB
 -----END PUBLIC KEY-----
 EOF
-        # Harmonize permissions
-        chown root:root "/etc/uks/pubdevkey01.pem"
-        chmod 0644 "/etc/uks/pubdevkey01.pem"
-        make_immutable "/etc/uks/pubdevkey01.pem"
+  # Harmonize permissions
+  chown root:root "/etc/uks/pubdevkey01.pem"
+  chmod 0644 "/etc/uks/pubdevkey01.pem"
+  make_immutable "/etc/uks/pubdevkey01.pem"
 }
 
-install_touch_update_key_squash()
-{
-    wb_log "install_touch_update_key_squash - Copying the jailbreak updater keystore"
-    make_mutable "/etc/uks.sqsh"
-    local my_loop="$(grep ' /etc/uks ' /proc/mounts | cut -f1 -d' ')"
-    umount "${my_loop}"
-    losetup -d "${my_loop}"
-    cp --verbose -f "/mnt/us/patchedUks.sqsh" "/etc/uks.sqsh"
-    mount -o loop="${my_loop}",nodiratime,noatime -t squashfs "/etc/uks.sqsh" "/etc/uks"
-    chown root:root "/etc/uks.sqsh"
-    chmod 0644 "/etc/uks.sqsh"
-    #make_immutable "/etc/uks.sqsh" # This breaks mounting on 12th gen (no, really)
+install_touch_update_key_squash() {
+  wb_log "install_touch_update_key_squash - Copying the jailbreak updater keystore"
+  make_mutable "/etc/uks.sqsh"
+  my_loop="$(grep ' /etc/uks ' /proc/mounts | cut -f1 -d' ')"
+  umount "${my_loop}"
+  losetup -d "${my_loop}"
+  cp --verbose -f "/mnt/us/patchedUks.sqsh" "/etc/uks.sqsh"
+  mount -o loop="${my_loop}",nodiratime,noatime -t squashfs "/etc/uks.sqsh" "/etc/uks"
+  chown root:root "/etc/uks.sqsh"
+  chmod 0644 "/etc/uks.sqsh"
+  #make_immutable "/etc/uks.sqsh" # This breaks mounting on 12th gen (no, really)
 }
 
 # The real fun starts here
 mntroot rw
 
 # Check if OTA is disabled and if so enable it so hotfix can later be applied
-if [ -f "/usr/bin/otaupd.bck" ] ; then
+if [ -f "/usr/bin/otaupd.bck" ]; then
   mv /usr/bin/otaupd.bck /usr/bin/otaupd
   wb_log "otaupd restored"
 fi
 
-if [ -f "/usr/bin/otav3.bck" ] ; then
+if [ -f "/usr/bin/otav3.bck" ]; then
   mv /usr/bin/otav3.bck /usr/bin/otav3
   wb_log "otav3 restored"
 fi
@@ -144,18 +133,18 @@ fi
 # Install update key in folder
 install_touch_update_key
 # Verify key installation
-if [ -f "/etc/uks/pubdevkey01.pem" ] ; then
-wb_log "Developer keys installed successfully (Standard Method)! (pubdevkey01.pem)"
+if [ -f "/etc/uks/pubdevkey01.pem" ]; then
+  wb_log "Developer keys installed successfully (Standard Method)! (pubdevkey01.pem)"
 else
   wb_log "ERR - Could not install pubdevkey01.pem (Standard Method)"
 fi
 
 # Check if we need to do something with the OTA SQSH keystore
-if [ -f "/etc/uks.sqsh" ] && [ -f "/mnt/us/patchedUks.sqsh" ] ; then
+if [ -f "/etc/uks.sqsh" ] && [ -f "/mnt/us/patchedUks.sqsh" ]; then
   install_touch_update_key_squash
 
   # Verify key installation
-  if [ "$(md5sum "${ROOT}/etc/uks.sqsh" | awk '{ print $1; }')" ==  "$(md5sum "${ROOT}/mnt/us/patchedUks.sqsh" | awk '{ print $1; }')" ] ; then
+  if [ "$(md5sum "${ROOT}/etc/uks.sqsh" | awk '{ print $1; }')" = "$(md5sum "${ROOT}/mnt/us/patchedUks.sqsh" | awk '{ print $1; }')" ]; then
     wb_log "Developer keys installed successfully! (uks.sqsh)"
     wb_log "$(ls /etc/uks)"
   else
@@ -173,20 +162,19 @@ rm -rf "/PRE_GM_DEBUGGING_FEATURES_ENABLED__REMOVE_AT_GMC"
 touch "/PRE_GM_DEBUGGING_FEATURES_ENABLED__REMOVE_AT_GMC"
 make_immutable "/PRE_GM_DEBUGGING_FEATURES_ENABLED__REMOVE_AT_GMC"
 
-if [ -f "/PRE_GM_DEBUGGING_FEATURES_ENABLED__REMOVE_AT_GMC" ] ; then
-    wb_log "Enabled developer flag"
+if [ -f "/PRE_GM_DEBUGGING_FEATURES_ENABLED__REMOVE_AT_GMC" ]; then
+  wb_log "Enabled developer flag"
 else
-    wb_log "Developer flag install FAIL"
+  wb_log "Developer flag install FAIL"
 fi
 
-
 touch "/MNTUS_EXEC"
 make_immutable "/MNTUS_EXEC"
 
-if [ -f "/MNTUS_EXEC" ] ; then
-    wb_log "Enabled mntus exec flag"
+if [ -f "/MNTUS_EXEC" ]; then
+  wb_log "Enabled mntus exec flag"
 else
-    wb_log "mntus exec flag install FAIL"
+  wb_log "mntus exec flag install FAIL"
 fi
 
 # Bye