From f68978e324c4dcfdb707835722d72af09a95b56c Mon Sep 17 00:00:00 2001
From: LukeZGD <26163116+LukeZGD@users.noreply.github.com>
Date: Tue, 3 Oct 2023 21:31:18 +0800
Subject: [PATCH] Disable stash on 9.x IPSWs (for #332)

---
 resources/jailbreak/untetherhomedepot.tar    | Bin 327680 -> 327680 bytes
 resources/jailbreak/untetherhomedepot921.tar | Bin 327680 -> 327680 bytes
 restore.sh                                   |  44 +++++++++++--------
 3 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/resources/jailbreak/untetherhomedepot.tar b/resources/jailbreak/untetherhomedepot.tar
index 4300b4b9498f2e7cdb339c2526d9b5476fab39c6..fc237d8d28ee018c381185a71c3b3acc00033e19 100644
GIT binary patch
delta 1285
zcmd5+O>0v@6wM?Tk!+gSFKDR^p_XDxoOv_vP106PsF-SPW3*M&*7Ev3tcY5uMO_F%
z5f#6pUEGzR2(F7R2J|Pm>JP|TH`1=OJDryoqEgq=#d}=NoO|ZXoZ(g~ZIwz}^+{4v
z#wn!{%BW$;NXlGg#Jxwz15*E@ijdgjZ%IpXOBj}>G1;UkvJtym>=N8CB21Xnl9C!C
zAPL4<Bt-))MI@w2>-6GEs<3h?WzZDk!;B5n9A3;rS2V+MeFWO^SrJ+WrR$0GP@3N2
z%r;$GFPUq5PQ7w-vVjRI@bzIB$eO+#vbZmW2zwnVybu(WJ3Iulp+uHa=GhLz$|!WS
z*q&P#uA>VSPZpqmyHm#hcKWHbW1Sj*I_=x>*IAy{!B?jsv0pBP`EY~!w2`|fSvJhw
z%lYB5pf-Na!+><C(|9Pp+su8zYP1UdcG$Mueal0VgN~#xS+1G8FL@5j1=#nG;A!(Z
zwbQ;q?|-^%-{vwsHxx&bg?=pMp@2_|kWj}DL2HzlflmXU&xA-fQPn(b5~axxqgWel
ztl`Zpd{vKzVU}Rx6eO_sAgo}11oDAw8hekz9(ADztpqoZKquD5bmPa8CcY}dy3*Jc
ztu_WfusjYztsR3wqIR9of7G?Ws@@-aC*X@>lh8(RV?vAEABU|#z6X~|(5ZHx)+<Vv
zSEFinDrl{hVT;rc)}xlr=q=RTOyE!-A&Gm>!FwE-(c;E5e2>NN#6P^5%#e5I;bk&&
zAmiM2FWd9iuFo&uu$LEKB+ugFW~{4Q4>Uc}f|2xlycw2hHb&AaiT!-LHW~i~kiAZ2

delta 393
zcmXX>yGz1h6!rc*P!v?A6c~a9Ej@pa&m@Qv6U{<UG)qv6Xs)TPKzh)S&}+CuQA5-e
z)%LCZ7rlmBq6m5{MKtyO%Hdw_xtx2>xuue)RPt<<x%`5fD&4dK4u4?RpxG6ob^0q!
z5;-?sUAm<QOc8YGh7mN(3Qf|xb2;YKgQn>)gb;l~Sbc_2Bw<*(!>`*~l7eU>_C?Vs
z?}m}lWG;q0aXEwr_C@f_y-}Dvol$Tvh6T;gc_5BKPL80R{X+<IT?F-VKZF+I&3-i4
zW37`H!)WD?F(rFFiVkAcD>8ElrP`HH&^D3YF?flK34F`5INZdSDKv9;2H*UXhQ(JY
zh<}gwB;1-jO`?;emWGG;Er(`#J83Ugv&d?EKA|pDSU3A~c$B$un>AlR6W>hXi;t%u
q<XQm*;)l5U=pe76TohH5`y^a^n8%Y1Ked{rZCB6940et})t+CEvv#cj

diff --git a/resources/jailbreak/untetherhomedepot921.tar b/resources/jailbreak/untetherhomedepot921.tar
index 70e81f83685d6b4713e6e2215bd82b4cbea26d1b..3025f4a2ada0155916995a58427c77b0c7f90bdc 100644
GIT binary patch
delta 1325
zcmd5+OKVd>6wV|EDcLl!FHmYjtR>hIXYNeyByH7%im6tO(N<Ag%k6zw5pA)pkA)Br
zQSlWmcvgZd*P@F7{Rys0*InyI+Ld<c+<QZ<*0uD)9S+|)=bLZl8&0j(TC26zpC%<`
zoKha4j2hgCq;iXlIQI#8NP<7A2#G!Uo-`#lg)np(lSZylrpRjSR=J1jFXAth8iE@}
zgozwArPPE%Hwb2!krefL7fCDwH)m$%7g^Kt>pbjj8J%88l@_j~44PuRpRs;gz{^G0
z70q&78h|!@UWVpg>9``@m!@|(vvLj%LgrYm9Yjt+HZVa2zC8??e9p7ND(*=k!d_bn
zHv|RcHV?skNRg+Mxt7haHVEy_mg@w>0XjwTbP0O4DrNjnrJpO?R;jUBY4^6j&g!T(
zzJ3Z4`{h*V4>zbs8@{`e<wM`yf)}O*weU+3GSa4Y<Dq!YhVN5mqgCj)!?yVDnJ$t7
zv?o2u3LCzAk{7UAf_?umo^D*HR@&X`{!f){TU4ee`r=6P(1VpCl<-*@66*LNXo-@X
zuhYO6V<EDesCp6Bh|<N6qPQ~H$l>igd{dA6VVq#%3?#7YAS_^U0E#|s8oQ3dPIaja
zEd<w&KnJc2>BdhLUHGO9OG;zcG}{pT#Og2z_5K+261C%mUQx#a>w16e8iB8horG3`
zt0S7^!7!}*^qn|cfezJlR%etBuSeDRDZh243hN{|Sf`pjr?*fOW4=Otge2~{03R?j
zrpb*__z{cWi+^NIS@P~8yh>&dWbM1oRcrFb%;em>H8=e-c^;?NV$GWeRWPlBLG^n8
O8m3AA9#ookIsOYM=T@=+

delta 408
zcmXv}OG|=L5cPf@2nteD3Jk%BTJ-!LS1pJV6U{_WGE2~kXkBe;RUlNfNa!Ini=tN5
zCaT@t_Ah!ZY7<4!V^c_*x?hih8RpF6%$Y*LRVcVNid1|;WreC6s>SOoX>4kVu~qit
zieSvT_Uup%)u$VNi>he>?SD+LSL=MVSqpI4_%U4#=(<JYoclR9{2G@FTn`u)uWIs^
znDuMB3ytK7phn#EBdv&R6gfu4AnfD`<B>We&}kwq;Z78Dil$Oe484>bKofcU5TfcZ
zY+^TvdPeKru$yU>l@>y1ptrcBy&OafBN_i_rW2C2Eg_+KM7ZN{Ga5^vEKXu@GCEJ8
zj@r{G)8`Njx=4Zl-gr&IsfgnwTA5IW;9~TWMV+`FH4DobWE46bksDI1le}5ni|nvD
zHIqjzU5(>|4#vU7N*;MecQN_VUQS9m8<SFQlW@>}4i6@LS1K1b9UX_0*gBfEDXwpP
Ca(aRQ

diff --git a/restore.sh b/restore.sh
index 44b3434..aa18f49 100755
--- a/restore.sh
+++ b/restore.sh
@@ -1059,8 +1059,10 @@ device_enter_mode() {
                 print "* If the script is stuck here, reboot and re-jailbreak the device, and try again."
                 print "* Follow the steps in the GitHub wiki under \"A6(X) devices, jailbroken on iOS 10\""
             fi
+            log "Sending files to device: ${sendfiles[*]}"
             $scp -P 2222 ${sendfiles[@]} root@127.0.0.1:/tmp
             if [[ $? == 0 ]]; then
+                log "Running kloader"
                 $ssh -p 2222 root@127.0.0.1 "bash /tmp/kloaders" &
             else
                 warn "Failed to connect to device via USB SSH."
@@ -1087,10 +1089,12 @@ device_enter_mode() {
                 until [[ -n $IPAddress ]]; do
                     read -p "$(input 'Enter the IP Address of your device: ')" IPAddress
                 done
+                log "Sending files to device: ${sendfiles[*]}"
                 $scp ${sendfiles[@]} root@$IPAddress:/tmp
                 if [[ $? != 0 ]]; then
                     error "Failed to connect to device via SSH, cannot continue."
                 fi
+                log "Running kloader"
                 $ssh root@$IPAddress "bash /tmp/kloaders" &
             fi
 
@@ -1806,6 +1810,14 @@ ipsw_prepare_1033() {
     fi
 }
 
+ipsw_daibutsu_rebootsh() {
+    log "Generating reboot.sh"
+    echo '#!/bin/bash' | tee reboot.sh
+    echo "mount_hfs /dev/disk0s1s1 /mnt1; mount_hfs /dev/disk0s1s2 /mnt2" | tee -a reboot.sh
+    echo "nvram -d boot-partition; nvram -d boot-ramdisk" | tee -a reboot.sh
+    echo "/usr/bin/haxx_overwrite --${device_type}_${device_target_build}" | tee -a reboot.sh
+}
+
 ipsw_prepare_jailbreak() {
     if [[ -e "$ipsw_custom.ipsw" ]]; then
         log "Found existing Custom IPSW. Skipping IPSW creation."
@@ -1817,14 +1829,7 @@ ipsw_prepare_jailbreak() {
 
     if [[ $ipsw_jailbreak == 1 ]]; then
         if [[ $device_target_vers == "8.4.1" ]]; then
-            log "Generating reboot.sh"
-            echo '#!/bin/bash' | tee reboot.sh
-            echo "mount_hfs /dev/disk0s1s1 /mnt1; mount_hfs /dev/disk0s1s2 /mnt2" | tee -a reboot.sh
-            echo "nvram -d boot-partition; nvram -d boot-ramdisk" | tee -a reboot.sh
-            echo "/usr/bin/haxx_overwrite --${device_type}_${device_target_build}" | tee -a reboot.sh
-            if [[ $ipsw_openssh == 1 ]]; then
-                JBFiles=("$jelbrek/sshdeb.tar")
-            fi
+            ipsw_daibutsu_rebootsh
             JBFiles2=("daibutsu/bin.tar" "daibutsu/untether.tar" "freeze.tar")
             for i in {0..2}; do
                 cp $jelbrek/${JBFiles2[$i]} .
@@ -1851,12 +1856,12 @@ ipsw_prepare_jailbreak() {
             if [[ $device_target_vers == "5"* ]]; then
                 JBFiles+=("$jelbrek/g1lbertJB.tar")
             fi
-            if [[ $ipsw_openssh == 1 ]]; then
-                JBFiles+=("$jelbrek/sshdeb.tar")
-            fi
             cp -R ../resources/firmware/FirmwareBundles .
             ExtraArgs+="-S 30" # system partition add
         fi
+        if [[ $ipsw_openssh == 1 ]]; then
+            JBFiles+=("$jelbrek/sshdeb.tar")
+        fi
     else
         cp -R ../resources/firmware/FirmwareBundles .
     fi
@@ -2013,7 +2018,11 @@ ipsw_prepare_bundle() {
     local hw="$device_model"
     local base_build="11D257"
     local RootSize
+    local daibutsu
     FirmwareBundle="FirmwareBundles/"
+    if [[ $1 == "daibutsu" ]]; then
+        daibutsu=1
+    fi
 
     mkdir FirmwareBundles 2>/dev/null
     if [[ $1 == "base" ]]; then
@@ -2138,7 +2147,8 @@ ipsw_prepare_bundle() {
         ipsw_prepare_32bit_paths NewiBoot $1
         ipsw_prepare_32bit_paths manifest $1
         echo -e "</dict>" >> $NewPlist
-    elif [[ $1 == "daibutsu" ]]; then
+    fi
+    if [[ $daibutsu == 1 ]]; then
         echo -e "<key>RamdiskPackage2</key><string>./bin.tar</string><key>RamdiskReboot</key><string>./reboot.sh</string><key>UntetherPath</key><string>./untether.tar</string>" >> $NewPlist
         local hwmodel="$(tr '[:lower:]' '[:upper:]' <<< ${device_model:0:1})${device_model:1}"
         echo -e "<key>hwmodel</key><string>$hwmodel</string>" >> $NewPlist
@@ -2170,11 +2180,7 @@ ipsw_prepare_32bit() {
         daibutsu="daibutsu"
         ExtraArgs+=" -daibutsu"
         cp $jelbrek/daibutsu/bin.tar $jelbrek/daibutsu/untether.tar .
-        log "Generating reboot.sh"
-        echo '#!/bin/bash' | tee reboot.sh
-        echo "mount_hfs /dev/disk0s1s1 /mnt1; mount_hfs /dev/disk0s1s2 /mnt2" | tee -a reboot.sh
-        echo "nvram -d boot-partition; nvram -d boot-ramdisk" | tee -a reboot.sh
-        echo "/usr/bin/haxx_overwrite --${device_type}_${device_target_build}" | tee -a reboot.sh
+        ipsw_daibutsu_rebootsh
     fi
 
     ipsw_prepare_bundle $daibutsu
@@ -4334,8 +4340,8 @@ device_dump() {
         log "Found existing dumped $arg: $dump"
         print "* Select Y to overwrite, or N to use existing dump"
         print "* Make sure to keep a backup of the dump if needed"
-        read -p "$(input 'Overwrite this existing dump? (Y/n) ')" opt
-        if [[ $opt == 'N' || $opt == 'n' ]]; then
+        read -p "$(input 'Overwrite this existing dump? (y/N) ')" opt
+        if [[ $opt != 'Y' && $opt != 'y' ]]; then
             return
         fi
         log "Deleting existing dumped $arg"