Fix conditions with ipsw_nskip, fixes #658

This commit is contained in:
LukeeGD 2025-01-20 17:43:56 +08:00
parent a6b17399a2
commit 41d0feace1

View File

@ -101,7 +101,6 @@ List of options:
--help Display this help message --help Display this help message
--no-color Disable colors for script output --no-color Disable colors for script output
--no-device Enable no device mode --no-device Enable no device mode
--no-version-check Disable script version checking
--old-menu Use the old menus with number select and y/n --old-menu Use the old menus with number select and y/n
--pwn Pwn the connected device --pwn Pwn the connected device
--sshrd Enter SSH ramdisk mode (requires additional arguments) --sshrd Enter SSH ramdisk mode (requires additional arguments)
@ -2457,8 +2456,7 @@ ipsw_preference_set() {
case $device_type in case $device_type in
iPad[23],[23] | "$device_disable_bbupdate" ) ipsw_nskip=1;; iPad[23],[23] | "$device_disable_bbupdate" ) ipsw_nskip=1;;
esac esac
if [[ $device_target_vers == "4.2"* || $device_target_vers == "4.3"* || $ipsw_gasgauge_patch == 1 ]] || if [[ $ipsw_gasgauge_patch == 1 ]] || [[ $platform == "macos" && $platform_arch == "arm64" ]]; then
[[ $platform == "macos" && $platform_arch == "arm64" ]]; then
ipsw_nskip=1 ipsw_nskip=1
fi fi
@ -3594,10 +3592,10 @@ ipsw_prepare_32bit() {
;; ;;
esac esac
fi fi
if [[ $device_target_vers == "3"* || $device_target_vers == "4"* ]] && [[ $ipsw_nskip != 1 ]]; then case $device_target_vers in
ipsw_prepare_jailbreak [23]* | 4.[01]* ) ipsw_prepare_jailbreak; return;;
return esac
elif [[ -e "$ipsw_custom.ipsw" ]]; then if [[ -e "$ipsw_custom.ipsw" ]]; then
log "Found existing Custom IPSW. Skipping IPSW creation." log "Found existing Custom IPSW. Skipping IPSW creation."
return return
elif [[ $ipsw_jailbreak == 1 && $ipsw_everuntether != 1 ]]; then elif [[ $ipsw_jailbreak == 1 && $ipsw_everuntether != 1 ]]; then
@ -7177,6 +7175,9 @@ menu_shsh_onboard() {
print "* Ignore this warning if this is a DRA/powdersn0w downgraded device." print "* Ignore this warning if this is a DRA/powdersn0w downgraded device."
fi fi
fi fi
if [[ $device_target_vers == "10"* ]]; then
warn "Saving iOS 10 blobs is not supported, converting raw dump to SHSH blob will fail."
fi
menu_items+=("Save Onboard Blobs") menu_items+=("Save Onboard Blobs")
else else
print "* Select IPSW of your current iOS version to continue" print "* Select IPSW of your current iOS version to continue"
@ -7222,6 +7223,9 @@ menu_shsh_convert() {
echo echo
print "* Selected IPSW: $ipsw_path.ipsw" print "* Selected IPSW: $ipsw_path.ipsw"
print "* IPSW Version: $device_target_vers-$device_target_build" print "* IPSW Version: $device_target_vers-$device_target_build"
if [[ $device_target_vers == "10"* ]]; then
warn "Saving iOS 10 blobs is not supported, converting raw dump to SHSH blob will fail."
fi
menu_items+=("Convert Raw Dump") menu_items+=("Convert Raw Dump")
elif (( device_proc < 7 )); then elif (( device_proc < 7 )); then
echo echo