diff --git a/README.md b/README.md index 4965a0c..64f29be 100644 --- a/README.md +++ b/README.md @@ -66,6 +66,7 @@ - bspatch - [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 - [daibutsuCFW](https://github.com/dora2-iOS/daibutsuCFW) - dora2ios - [libimobiledevice](https://github.com/libimobiledevice/libimobiledevice) - libimobiledevice - [libirecovery](https://github.com/libimobiledevice/libirecovery) - libimobiledevice diff --git a/resources/depends.sh b/resources/depends.sh index 617441c..734f343 100755 --- a/resources/depends.sh +++ b/resources/depends.sh @@ -35,6 +35,7 @@ SetToolPaths() { futurerestore="./resources/tools/futurerestore_macos_$(uname -m)" [[ ! -e $futurerestore ]] && futurerestore="./resources/tools/futurerestore_macos_arm64" ipwnder32="./resources/tools/ipwnder32_macos" + ipwnder_lite="./resources/tools/ipwnder_macos" python="/usr/bin/python" zenity="./resources/tools/zenity_macos" fi diff --git a/resources/device.sh b/resources/device.sh index e1012b1..77ed26a 100755 --- a/resources/device.sh +++ b/resources/device.sh @@ -173,15 +173,18 @@ CheckM8() { local pwnDFUDevice local pwnD=1 - if [[ $platform == "macos" && $(uname -m) != "x86_64" ]]; then - pwnDFUTool="iPwnder32" - elif [[ $platform == "macos" ]]; then - Selection=("iPwnder32" "ipwndfu") - Input "Select pwnDFU tool to use (Select 1 if unsure):" + if [[ $platform == "macos" ]]; then + Selection=("iPwnder32" "ipwnder_lite" "ipwndfu") + Input "PwnDFU Tool Option" + Echo "* This option selects what tool to use to put your device in pwnDFU mode." + Echo "* If unsure, select 1 for Intel Macs, select 2 for Apple Silicon (M1) Macs." + Echo "* This option is set to iPwnder32 by default (1)." + Input "Select your option:" select opt in "${Selection[@]}"; do case $opt in + "ipwnder_lite") pwnDFUTool="$ipwnder_lite"; break;; "ipwndfu" ) pwnDFUTool="ipwndfu"; break;; - *) pwnDFUTool="iPwnder32"; break;; + * ) pwnDFUTool="$ipwnder32"; break;; esac done else @@ -204,8 +207,8 @@ CheckM8() { kDFU iBSS || echo pwnDFUDevice=$? fi - elif [[ $pwnDFUTool == "iPwnder32" ]]; then - $ipwnder32 -p + else + $pwnDFUTool -p pwnDFUDevice=$? fi [[ $DeviceProc == 7 ]] && pwnD=$($irecovery -q | grep -c "PWND") diff --git a/resources/tools/ipwnder_macos b/resources/tools/ipwnder_macos new file mode 100755 index 0000000..2887048 Binary files /dev/null and b/resources/tools/ipwnder_macos differ