From 84aa8142de47098f98d39dd4ad13ef8ea4cecd79 Mon Sep 17 00:00:00 2001
From: LukeZGD <26163116+LukeZGD@users.noreply.github.com>
Date: Thu, 22 Dec 2022 13:02:03 +0800
Subject: [PATCH] Fix baseband issues on Windows

---
 README.md              |  2 +-
 resources/depends.sh   | 10 ++++------
 resources/downgrade.sh |  5 -----
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 56bb568..6c5be3b 100644
--- a/README.md
+++ b/README.md
@@ -77,7 +77,7 @@
 - [**openSUSE**](https://www.opensuse.org/) Tumbleweed, Leap 15.4
 - [**Gentoo**](https://www.gentoo.org/) and Gentoo-based distros
 - **macOS** 10.13 and newer
-- **Windows** 7 and newer
+- **Windows** 8.1 and newer
 
 ## Tools and other stuff used
 - cURL
diff --git a/resources/depends.sh b/resources/depends.sh
index c3de970..5363822 100755
--- a/resources/depends.sh
+++ b/resources/depends.sh
@@ -105,11 +105,9 @@ SetToolPaths() {
         fi
     elif [[ $platform == "win" ]]; then
         ping="ping -n 1"
-        Log "WARNING - Using iOS-OTA-Downgrader on Windows is HIGHLY DISCOURAGED."
+        Log "WARNING - Using iOS-OTA-Downgrader on Windows is not recommended."
         Echo "* Please use it on Linux or macOS instead."
-        Echo "* You may still continue, but you might encounter problems with restoring the device."
-        Echo "* You have been warned."
-        sleep 5
+        Echo "* You may still continue, but you might encounter issues with restoring the device."
         Input "Press Enter/Return to continue anyway (or press Ctrl+C to cancel)"
         read -s
     fi
@@ -216,10 +214,10 @@ InstallDepends() {
         Echo "* The script will detect this automatically and will use the Homebrew/MacPorts versions of the tools"
 
     elif [[ $platform == "win" ]]; then
-        pacman -Sy --noconfirm --needed ca-certificates curl openssh unzip zip
+        pacman -Sy --noconfirm --needed ca-certificates curl libcurl openssh unzip zip
         libimobiledevice=("https://github.com/LukeZGD/iOS-OTA-Downgrader-Keys/releases/download/tools/libimobiledevice_win.zip" "75ae3af3347b89107f0f6b7e41fde42e6ccdd404")
         if [[ ! $(ls ../resources/tools/*win*) ]]; then
-            SaveFile https://github.com/LukeZGD/iOS-OTA-Downgrader-Keys/releases/download/tools/tools_win.zip tools_win.zip b8b727b74d3bbba2093bef5a156e30cb29d6eac7
+            SaveFile https://github.com/LukeZGD/iOS-OTA-Downgrader-Keys/releases/download/tools/tools_win.zip tools_win.zip 4436d23034e9bec1b855aabb69ae0013fec5e2cb
             Log "Extracting Windows tools..."
             unzip -oq tools_win.zip -d ../resources
         fi
diff --git a/resources/downgrade.sh b/resources/downgrade.sh
index 92c8d05..f63a8e1 100755
--- a/resources/downgrade.sh
+++ b/resources/downgrade.sh
@@ -149,11 +149,6 @@ iDeviceRestore() {
         FRBaseband
         cp saved/baseband/$Baseband tmp/bbfw.tmp
         cp $BuildManifest tmp/
-        Log "WARNING - The restore is most likely to fail on updating baseband!!"
-        Echo "* This may or may not be fixed anytime soon."
-        Echo "* I highly suggest to do the restore in Linux/macOS instead to avoid issues."
-        Input "Press Enter/Return to continue anyway (or press Ctrl+C to cancel)"
-        read -s
     fi
     Log "Running idevicere${re}store with command: $idevicerestore $ExtraArgs \"$IPSWRestore.ipsw\""
     $idevicerestore $ExtraArgs "$IPSWRestore.ipsw"