Update ipsw tool, and other changes

README.md

@@ -128,7 +128,7 @@
 - [libimobiledevice](https://github.com/libimobiledevice/libimobiledevice)
 - [imobiledevice-net](https://github.com/libimobiledevice-win32/imobiledevice-net) (macOS)
 - [idevicerestore](https://github.com/LukeeGD/idevicerestore)
-- ipsw tool from OdysseusOTA/2
+- ipsw tool from [xpwn](https://github.com/LukeeGD/xpwn) (OdysseusOTA/2)
 - Python 2 (for ipwndfu, rmsigchks, SimpleHTTPServer)
 - [tsschecker](https://github.com/tihmstar/tsschecker)
 - [futurerestore 152](http://api.tihmstar.net/builds/futurerestore/futurerestore-latest.zip) (32-bit)

resources/depends.sh

@@ -8,7 +8,6 @@ SetToolPaths() {
         futurerestore1="sudo LD_PRELOAD=./resources/lib/libcurl.so.3 LD_LIBRARY_PATH=./resources/lib ./resources/tools/futurerestore1_linux"
         futurerestore2="sudo LD_LIBRARY_PATH=./resources/lib ./resources/tools/futurerestore2_linux"
         idevicerestore="sudo LD_LIBRARY_PATH=./resources/lib ./resources/tools/idevicerestore_linux"
-        ipsw="env LD_LIBRARY_PATH=./lib ./tools/ipsw_linux"
         python="$(which python2)"
         ipwndfu="sudo $python ipwndfu"
         rmsigchks="sudo $python rmsigchks.py"
@@ -21,7 +20,6 @@ SetToolPaths() {
         futurerestore1="./resources/tools/futurerestore1_macos"
         futurerestore2="./resources/tools/futurerestore2_macos"
         idevicerestore="./resources/tools/idevicerestore_macos"
-        ipsw="./tools/ipsw_macos"
         ipwnder32="./resources/tools/ipwnder32_macos"
         python="/usr/bin/python"
         ipwndfu="$python ipwndfu"
@@ -33,6 +31,7 @@ SetToolPaths() {
     ideviceenterrecovery="./resources/libimobiledevice_$platform/ideviceenterrecovery"
     ideviceinfo="./resources/libimobiledevice_$platform/ideviceinfo"
     iproxy="./resources/libimobiledevice_$platform/iproxy"
+    ipsw="./tools/ipsw_$platform"
     irecoverychk="./resources/libimobiledevice_$platform/irecovery"
     irecovery="$irecoverychk"
     [[ $platform == "linux" ]] && irecovery="sudo $irecovery"
@@ -116,7 +115,7 @@ InstallDepends() {
         ln -sf /usr/lib64/libbz2.so.1.* ../resources/lib/libbz2.so.1.0
     
     elif [[ $ID == "opensuse-tumbleweed" ]]; then
-        sudo zypper -n in bsdiff git libimobiledevice libpng12-0 libopenssl1_0_0 python-base
+        sudo zypper -n in bsdiff curl git libimobiledevice libpng12-0 libopenssl1_0_0 python-base
         ln -sf /usr/lib64/libzip.so.5 ../resources/lib/libzip.so.4
     
     elif [[ $platform == "macos" ]]; then

resources/device.sh

@@ -43,7 +43,7 @@ GetDeviceValues() {
     
     if [[ ! $ProductType ]]; then
         Error "No device detected. Please put the device in normal mode before proceeding. Recovery or DFU mode is also applicable" \
-        "For more details regarding alternative methods, read the 'Other Notes' section of the README"
+        "For more details regarding alternative methods, read the \"Other Notes\" section of the README"
     fi
     
     Firmware=resources/firmware/$ProductType
@@ -104,7 +104,7 @@ GetDeviceValues() {
     
     if [[ ! $BasebandURL || ! $HWModel ]]; then
         Error "Missing BasebandURL and/or HWModel values. Is the firmware folder missing?" \
-        "Reinstall dependencies and try again. For more details, read the 'Other Notes' section of the README"
+        "Reinstall dependencies and try again. For more details, read the \"Other Notes\" section of the README"
     fi
     
     if [[ $ProductType == "iPod5,1" ]]; then
@@ -161,7 +161,7 @@ CheckM8() {
         echo -e "\n${Color_R}[Error] Failed to enter pwnDFU mode. Please run the script again: ./restore.sh Downgrade ${Color_N}"
         echo "${Color_Y}* This step may fail a lot, especially on Linux, and unfortunately there is nothing I can do about the low success rates. ${Color_N}"
         echo "${Color_Y}* The only option is to make sure you are using an Intel device, and to try multiple times ${Color_N}"
-        Echo "* For more details, read the 'Other Notes' section of the README"
+        Echo "* For more details, read the \"Other Notes\" section of the README"
         exit 1
     elif [[ $pwnDFUDevice == 0 ]]; then
         Log "Device in pwnDFU mode detected."
@@ -242,7 +242,7 @@ kDFU() {
     Echo "* Reinstall OpenSSH/Dropbear, reboot and rejailbreak, then reinstall them again"
     echo
     Input "Enter the root password of your iOS device when prompted"
-    Echo "* The default password is 'alpine'"
+    Echo "* The default password is \"alpine\""
     $SCP -P 2222 resources/tools/$kloader tmp/pwnediBSS root@127.0.0.1:/tmp
     if [[ $? == 0 ]]; then
         $SSH -p 2222 root@127.0.0.1 "/tmp/$kloader /tmp/pwnediBSS" &
@@ -272,7 +272,7 @@ kDFU() {
 
 pwnREC() {
     if [[ $ProductType == "iPad4,4" || $ProductType == "iPad4,5" ]]; then
-        Log "iPad mini 2 device detected. Setting iBSS and iBEC to 'ipad4b'"
+        Log "iPad mini 2 device detected. Setting iBSS and iBEC to \"ipad4b\""
         iBEC=$iBECb
         iBSS=$iBSSb
     fi

resources/downgrade.sh

@@ -8,7 +8,7 @@ iDeviceRestore() {
     $idevicerestore -ewy $IPSWRestore.ipsw
     if [[ $platform == "macos" && $? != 0 ]]; then
         Log "An error seems to have occurred when running idevicerestore."
-        Echo "* If this is the 'Killed: 9' error or similar, try these steps:"
+        Echo "* If this is the \"Killed: 9\" error or similar, try these steps:"
         Echo "* Using Terminal, cd to where the script is located, then run"
         Echo "* sudo codesign --sign - --force --deep resources/tools/idevicerestore_macos"
     fi