From 5b1fea684fbb306474756693d65775ca6e3a81b0 Mon Sep 17 00:00:00 2001
From: LukeZGD <26163116+LukeZGD@users.noreply.github.com>
Date: Mon, 3 Oct 2022 12:32:40 +0800
Subject: [PATCH] Add Gentoo to readme and some updates

---
 README.md            |  1 +
 resources/depends.sh |  6 +++---
 resources/ipsw.sh    | 15 +++++++--------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index b6c4732..56bb568 100644
--- a/README.md
+++ b/README.md
@@ -75,6 +75,7 @@
 - [**Fedora**](https://getfedora.org/) 36 and newer
 - [**Debian**](https://www.debian.org/) 11 Bullseye and newer, Sid, and Debian-based distros
 - [**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
 
diff --git a/resources/depends.sh b/resources/depends.sh
index 80330a0..5ca100a 100755
--- a/resources/depends.sh
+++ b/resources/depends.sh
@@ -179,9 +179,9 @@ InstallDepends() {
         sudo pacman -Sy --noconfirm --needed base-devel bsdiff curl libimobiledevice openssh python udev unzip usbmuxd usbutils vim xmlstarlet zenity
    
     elif [[ $ID == "gentoo" || $ID_LIKE == "gentoo" || $ID == "pentoo" ]]; then
-        echo "* Gentoo repos do not ship python2, which is needed for ipwndfu"
-        echo "* If you need to use ipwndfu, python2 can be installed from the official site"
-        sudo emerge -av bsdiff net-misc/curl libimobiledevice openssh python udev unzip usbmuxd usbutils vim xmlstarlet zenity python zenity
+        Echo "* Gentoo repos do not ship python2, which is needed for ipwndfu"
+        Echo "* If you need to use ipwndfu, python2 can be installed from the official site"
+        sudo emerge -av bsdiff net-misc/curl libimobiledevice openssh python udev unzip usbmuxd usbutils vim xmlstarlet zenity
     
     elif [[ -n $UBUNTU_CODENAME && $VERSION_ID == "2"* ]] ||
          (( DebianVer >= 11 )) || [[ $DebianVer == "sid" ]]; then
diff --git a/resources/ipsw.sh b/resources/ipsw.sh
index 013d2c0..cb5e3e2 100755
--- a/resources/ipsw.sh
+++ b/resources/ipsw.sh
@@ -73,11 +73,13 @@ JailbreakOption() {
         IPSWCustom="${ProductType}_${OSVer}_${BuildVer}_${Custom}"
         [[ $OSVer == 4.3* ]] && IPSWCustom+="-$UniqueChipID"
     elif [[ $ProductType == "$DisableBBUpdate" ]]; then
-        Log "WARNING - Baseband update will be disabled for the custom IPSW."
-        Echo "* With baseband update disabled, activation errors may occur."
-        Echo "* Do NOT continue if you do not have other means for activation."
-        Input "Press Enter/Return to continue anyway (or press Ctrl+C to cancel)"
-        read -s
+        Log "Baseband update will be disabled for the custom IPSW."
+        if [[ $ProductType != "iPad2,3" ]]; then
+            Log "WARNING - With baseband update disabled, activation errors might occur."
+            Echo "* If you do not have other means for activation, this is not recommended."
+            Input "Press Enter/Return to continue anyway (or press Ctrl+C to cancel)"
+            read -s
+        fi
         Baseband=0
         IPSWCustom+="B"
         if [[ $platform != "win" && $Jailbreak != 1 ]]; then
@@ -296,9 +298,6 @@ IPSW4() {
 
     cd tmp
     if [[ $OSVer == "7.1.2" && ! -e $IPSWCustom.ipsw ]]; then
-        if [[ $platform == "win" ]]; then
-            ipsw="${ipsw}3"
-        fi
         Log "Preparing custom IPSW..."
         cp -rf ../resources/firmware/FirmwareBundles .
         $ipsw ../$IPSW.ipsw ../$IPSWCustom.ipsw $JBMemory -S 50 ${JBFiles[@]}