From c107705cf2c07cd9717454c044b6b8ce0b05d17e Mon Sep 17 00:00:00 2001
From: LukeZGD <26163116+LukeZGD@users.noreply.github.com>
Date: Fri, 19 Apr 2024 10:22:48 +0800
Subject: [PATCH] Update some messages

---
 README.md  |  6 +++---
 restore.sh | 27 ++++++++++++++++-----------
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index 06f15b8..3c94474 100644
--- a/README.md
+++ b/README.md
@@ -7,8 +7,8 @@
 - **Read the ["Troubleshooting" wiki page](https://github.com/LukeZGD/Legacy-iOS-Kit/wiki/Troubleshooting) for tips, frequent questions, and troubleshooting**
 
 ## Features
-- Legacy iOS Kit supports all 32-bit iOS devices, and some 64-bit (A7/A8/A9/A10) devices
-    - Devices that received iOS 16 and newer are not supported and only have limited functionality (such as sideload on Linux etc.)
+- Legacy iOS Kit supports all 32-bit iOS devices, and some 64-bit (A7/A8/A9/A10/A11) devices
+    - Devices that received iOS 16 and newer are mostly not supported and only have limited functionality (such as sideload on Linux etc.)
     - S5L8900 devices (iPhone 2G, 3G, touch 1) are only partially supported, some features like SSH ramdisk are not available
 - Restore to signed OTA versions (iOS 8.4.1 and/or 6.1.3) on A5/A6 devices
 - Restore some 32-bit devices to other iOS versions without blobs
@@ -85,7 +85,7 @@
     - iPad Air 1, 2
     - iPad mini 2, 3, 4
     - iPod touch 6, 7
-- Restoring with iOS 16.6.x SHSH blobs using futurerestore is also supported on these devices:
+- Restoring with iOS 16.6.x SHSH blobs using futurerestore is also supported on these devices (SSH ramdisks not supported):
     - iPhone 8, X
     - iPad 5
     - iPad Pro 9.7/12.9 1st gen
diff --git a/restore.sh b/restore.sh
index a56df0e..1c2e2c5 100755
--- a/restore.sh
+++ b/restore.sh
@@ -243,8 +243,9 @@ set_tool_paths() {
             local mac_ver=${platform_ver:3}
             mac_ver=${mac_ver%.*}
             if (( mac_ver < 13 )); then
-                error "Your macOS version ($platform_ver) is not supported." \
-                "* You need to be on macOS 10.13 or newer to continue."
+                warn "Your macOS version ($platform_ver) is not supported. Expect features to not work properly."
+                print "* Supported versions are macOS 10.13 and newer. (10.15 and newer recommended)"
+                pause
             fi
             if [[ $(which curl) == "/usr/bin/curl" ]] && (( mac_ver < 15 )); then
                 local error_msg="* You need to install curl from MacPorts. (MacPorts is recommended instead of Homebrew)"
@@ -3527,6 +3528,7 @@ ipsw_prepare_s5l8900() {
     local rname="018-6494-014.dmg"
     local sha1E="4f6539d2032a1c7e1a068c667e393e62d8912700"
     local sha1L
+    ipsw_url="https://github.com/LukeZGD/Legacy-iOS-Kit-Keys/releases/download/jailbreak/"
     if [[ $device_target_vers == "4.1" ]]; then
         rname="018-7079-079.dmg"
         sha1E="9a64eea9949b720f1033d41adc85254e6dbf9525"
@@ -3534,14 +3536,14 @@ ipsw_prepare_s5l8900() {
         rname="038-0029-002.dmg"
         sha1E="a8914d2f7f0dddc41eb17f197d0633d7bcb9f6b4"
     elif [[ $device_type == "iPhone1,1" && $ipsw_hacktivate == 1 ]]; then
+        ipsw_url+="iPhone1.1_3.1.3_7E18_Custom_Hacktivate.ipsw"
         sha1E="f642829875ce632cd071e62169a1acbdcffcf0c8"
-        ipsw_url="https://github.com/LukeZGD/Legacy-iOS-Kit-Keys/releases/download/jailbreak/iPhone1.1_3.1.3_7E18_Custom_Hacktivate.ipsw"
     elif [[ $device_type == "iPhone1,1" ]]; then
+        ipsw_url+="iPhone1.1_3.1.3_7E18_Custom.ipsw"
         sha1E="7b3dd17c48c139dc827696284736d3c37d8fb7ac"
-        ipsw_url="https://github.com/LukeZGD/Legacy-iOS-Kit-Keys/releases/download/jailbreak/iPhone1.1_3.1.3_7E18_Custom.ipsw"
     elif [[ $device_type == "iPod1,1" ]]; then
+        ipsw_url+="iPod1.1_3.1.3_7E18_Custom.ipsw"
         sha1E="f76cd3d4deaf82587dc758c6fbe724c31c9b6de2"
-        ipsw_url="https://github.com/LukeZGD/Legacy-iOS-Kit-Keys/releases/download/jailbreak/iPod1.1_3.1.3_7E18_Custom.ipsw"
     fi
 
     if [[ $device_type == "iPhone1,2" && -e "$ipsw_custom.ipsw" ]]; then
@@ -6585,18 +6587,21 @@ restore_customipsw() {
         else
             warn "* Do NOT use this option for powdersn0w or jailbreak IPSWs made with Legacy iOS Kit!"
         fi
+        if [[ $platform == "macos" ]] && [[ $device_type == "iPod2,1" || $device_proc == 1 ]]; then
+            warn "* Restoring to 2.x might not work on newer macOS versions."
+        fi
+    fi
+    if [[ $device_proc == 1 ]]; then
+        echo
+        print "* Note that you might need to restore twice, due to NOR flash."
+        print "* For iPhone 2G/3G, the second restore may fail due to baseband."
+        print "* You can exit recovery mode after by going to: Other Utilities -> Exit Recovery Mode"
     fi
     pause
     menu_ipsw_browse custom
     if [[ -z $ipsw_path ]]; then
         error "No IPSW selected, cannot continue."
     fi
-    if [[ $device_proc == 1 ]]; then
-        print "* Note that you might need to restore twice, due to NOR flash."
-        print "* For iPhone 2G/3G, the second restore may fail due to baseband."
-        print "* You can exit recovery mode after by going to: Other Utilities -> Exit Recovery Mode"
-        pause
-    fi
     if [[ $device_proc == 1 ]]; then
         device_enter_mode WTFreal
     else