Remove gaster

- it doesn't work anyway
- on macos, it succeeds, but futurerestore gets stuck unlike with ipwnder
- on linux, it just doesn't work at all for a7
This commit is contained in:
LukeZGD 2022-09-30 09:34:32 +08:00
parent 122a6f466d
commit c95966c917
5 changed files with 6 additions and 18 deletions

View File

@ -87,7 +87,6 @@
- [ipwndfu](https://github.com/LukeZGD/ipwndfu) - LukeZGD fork - [ipwndfu](https://github.com/LukeZGD/ipwndfu) - LukeZGD fork
- [iPwnder32](https://github.com/dora2-iOS/iPwnder32) - dora2ios - [iPwnder32](https://github.com/dora2-iOS/iPwnder32) - dora2ios
- [ipwnder_lite](https://github.com/dora2-iOS/ipwnder_lite) - 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) - [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)) - [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) - [tsschecker](https://github.com/tihmstar/tsschecker) - tihmstar; [1Conan fork](https://github.com/1Conan/tsschecker)

View File

@ -53,7 +53,6 @@ SetToolPaths() {
fi fi
cherrybin="../$cherry/cherry" cherrybin="../$cherry/cherry"
gaster="./resources/tools/gaster_$platform"
ideviceenterrecovery="$MPath/ideviceenterrecovery" ideviceenterrecovery="$MPath/ideviceenterrecovery"
ideviceinfo="$MPath/ideviceinfo" ideviceinfo="$MPath/ideviceinfo"
idevicerestore="./resources/tools/idevicerestore_$platform" idevicerestore="./resources/tools/idevicerestore_$platform"

View File

@ -217,10 +217,9 @@ EnterPwnDFU() {
local pwnDFUTool local pwnDFUTool
local pwnDFUDevice local pwnDFUDevice
local pwnD=1 local pwnD=1
local pwn="-p"
local Selection=() local Selection=()
if [[ $DeviceProc == 4 ]]; then if [[ $DeviceProc == 4 && $platform != "macos" ]]; then
pwnDFUTool="$pwnedDFU" pwnDFUTool="$pwnedDFU"
if [[ $platform == "win" ]]; then if [[ $platform == "win" ]]; then
Log "iPhone 4 device detected in DFU mode." 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)" Input "Press Enter/Return to continue (or press Ctrl+C to cancel)"
read -s read -s
return return
elif [[ $platform == "macos" ]]; then
pwnDFUTool="$ipwnder32"
fi fi
elif [[ $platform == "macos" || $DeviceProc == 7 ]]; then elif [[ $platform == "macos" ]]; then
[[ $platform == "macos" ]] && Selection+=("ipwnder_lite" "iPwnder32") Selection+=("ipwnder_lite" "iPwnder32")
[[ $DeviceProc == 7 ]] && Selection+=("gaster")
Input "PwnDFU Tool Option" Input "PwnDFU Tool Option"
Echo "* This option selects what tool to use to put your device in pwnDFU mode." Echo "* This option selects what tool to use to put your device in pwnDFU mode."
if [[ $platform == "linux" ]]; then Echo "* If unsure, select 1. If 1 does not work, try selecting the other option."
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 "* This option is set to ${Selection[0]} by default (1)." Echo "* This option is set to ${Selection[0]} by default (1)."
Input "Select your option:" Input "Select your option:"
select opt in "${Selection[@]}"; do select opt in "${Selection[@]}"; do
case $opt in case $opt in
"ipwnder_lite" ) pwnDFUTool="$ipwnder_lite"; break;; "ipwnder_lite" ) pwnDFUTool="$ipwnder_lite"; break;;
"iPwnder32" ) pwnDFUTool="$ipwnder32"; break;; "iPwnder32" ) pwnDFUTool="$ipwnder32"; break;;
"gaster" ) pwnDFUTool="$gaster"; break;;
"ipwndfu" ) pwnDFUTool="ipwndfu"; SaveExternal ipwndfu; break;;
esac esac
done done
else else
Echo "* For Arch, install python2 first from AUR before using ipwndfu."
pwnDFUTool="ipwndfu" pwnDFUTool="ipwndfu"
SaveExternal ipwndfu SaveExternal ipwndfu
fi fi
[[ $pwnDFUTool == "$gaster" ]] && pwn="pwn"
Log "Entering pwnDFU mode with: $pwnDFUTool" Log "Entering pwnDFU mode with: $pwnDFUTool"
if [[ $pwnDFUTool == "ipwndfu" ]]; then if [[ $pwnDFUTool == "ipwndfu" ]]; then
cd resources/ipwndfu cd resources/ipwndfu
@ -273,7 +263,7 @@ EnterPwnDFU() {
SendPwnediBSS SendPwnediBSS
fi fi
else else
$pwnDFUTool $pwn $pwnDFUTool -p
pwnDFUDevice=$? pwnDFUDevice=$?
fi fi
if [[ $DeviceProc == 4 || $DeviceProc == 7 ]]; then if [[ $DeviceProc == 4 || $DeviceProc == 7 ]]; then

Binary file not shown.

Binary file not shown.