diff --git a/README.md b/README.md index 64c83a1..b6c4732 100644 --- a/README.md +++ b/README.md @@ -87,7 +87,6 @@ - [ipwndfu](https://github.com/LukeZGD/ipwndfu) - LukeZGD fork - [iPwnder32](https://github.com/dora2-iOS/iPwnder32) - dora2ios - [ipwnder_lite](https://github.com/dora2-iOS/ipwnder_lite) - dora2ios -- [gaster](https://github.com/0x7ff/gaster) - 0x7ff; [verygenericname (Nathan) fork](https://github.com/verygenericname/gaster) - [daibutsuCFW](https://github.com/dora2-iOS/daibutsuCFW) - dora2ios; [LukeZGD fork](https://github.com/LukeZGD/daibutsuCFW) - [libimobiledevice](https://github.com/libimobiledevice/libimobiledevice), [libirecovery](https://github.com/libimobiledevice/libirecovery) - libimobiledevice ([macOS/Windows builds](https://github.com/libimobiledevice-win32/imobiledevice-net)) - [tsschecker](https://github.com/tihmstar/tsschecker) - tihmstar; [1Conan fork](https://github.com/1Conan/tsschecker) diff --git a/resources/depends.sh b/resources/depends.sh index c9af577..3c5f4f7 100755 --- a/resources/depends.sh +++ b/resources/depends.sh @@ -53,7 +53,6 @@ SetToolPaths() { fi cherrybin="../$cherry/cherry" - gaster="./resources/tools/gaster_$platform" ideviceenterrecovery="$MPath/ideviceenterrecovery" ideviceinfo="$MPath/ideviceinfo" idevicerestore="./resources/tools/idevicerestore_$platform" diff --git a/resources/device.sh b/resources/device.sh index ff3e69c..03da371 100755 --- a/resources/device.sh +++ b/resources/device.sh @@ -217,10 +217,9 @@ EnterPwnDFU() { local pwnDFUTool local pwnDFUDevice local pwnD=1 - local pwn="-p" local Selection=() - if [[ $DeviceProc == 4 ]]; then + if [[ $DeviceProc == 4 && $platform != "macos" ]]; then pwnDFUTool="$pwnedDFU" if [[ $platform == "win" ]]; then Log "iPhone 4 device detected in DFU mode." @@ -229,35 +228,26 @@ EnterPwnDFU() { Input "Press Enter/Return to continue (or press Ctrl+C to cancel)" read -s return - elif [[ $platform == "macos" ]]; then - pwnDFUTool="$ipwnder32" fi - elif [[ $platform == "macos" || $DeviceProc == 7 ]]; then - [[ $platform == "macos" ]] && Selection+=("ipwnder_lite" "iPwnder32") - [[ $DeviceProc == 7 ]] && Selection+=("gaster") + elif [[ $platform == "macos" ]]; then + Selection+=("ipwnder_lite" "iPwnder32") Input "PwnDFU Tool Option" Echo "* This option selects what tool to use to put your device in pwnDFU mode." - if [[ $platform == "linux" ]]; then - Selection+=("ipwndfu") - Echo "* For Arch, install python2 first from AUR before selecting ipwndfu." - fi - Echo "* If unsure, select 1. If 1 does not work, try selecting the other options." + Echo "* If unsure, select 1. If 1 does not work, try selecting the other option." Echo "* This option is set to ${Selection[0]} by default (1)." Input "Select your option:" select opt in "${Selection[@]}"; do case $opt in "ipwnder_lite" ) pwnDFUTool="$ipwnder_lite"; break;; "iPwnder32" ) pwnDFUTool="$ipwnder32"; break;; - "gaster" ) pwnDFUTool="$gaster"; break;; - "ipwndfu" ) pwnDFUTool="ipwndfu"; SaveExternal ipwndfu; break;; esac done else + Echo "* For Arch, install python2 first from AUR before using ipwndfu." pwnDFUTool="ipwndfu" SaveExternal ipwndfu fi - [[ $pwnDFUTool == "$gaster" ]] && pwn="pwn" Log "Entering pwnDFU mode with: $pwnDFUTool" if [[ $pwnDFUTool == "ipwndfu" ]]; then cd resources/ipwndfu @@ -273,7 +263,7 @@ EnterPwnDFU() { SendPwnediBSS fi else - $pwnDFUTool $pwn + $pwnDFUTool -p pwnDFUDevice=$? fi if [[ $DeviceProc == 4 || $DeviceProc == 7 ]]; then diff --git a/resources/tools/gaster_linux b/resources/tools/gaster_linux deleted file mode 100755 index f6dfa18..0000000 Binary files a/resources/tools/gaster_linux and /dev/null differ diff --git a/resources/tools/gaster_macos b/resources/tools/gaster_macos deleted file mode 100755 index 8662491..0000000 Binary files a/resources/tools/gaster_macos and /dev/null differ