diff --git a/README.md b/README.md index 64f29be..3ffc557 100644 --- a/README.md +++ b/README.md @@ -73,6 +73,7 @@ - [imobiledevice-net](https://github.com/libimobiledevice-win32/imobiledevice-net) - libimobiledevice-win32 (macOS build) - ipsw tool from [xpwn](https://github.com/LukeZGD/xpwn) - LukeZGD fork - Python 2 (for ipwndfu, rmsigchks, SimpleHTTPServer) +- Python 3 (http.server) - [tsschecker](https://github.com/tihmstar/tsschecker) - tihmstar - [futurerestore](https://github.com/m1stadev/futurerestore/tree/test) - m1stadev fork - [kloader](https://www.youtube.com/watch?v=fh0tB6fp0Sc) diff --git a/resources/depends.sh b/resources/depends.sh index 1f50afb..577dcc8 100755 --- a/resources/depends.sh +++ b/resources/depends.sh @@ -62,6 +62,12 @@ SetToolPaths() { ipwndfu="sudo $ipwndfu" irecovery="sudo LD_LIBRARY_PATH=./resources/lib $irecovery" rmsigchks="sudo $rmsigchks" + elif [[ $platform == "macos" ]]; then + if (( ${platformver:0:2} > 11 )) && [[ -z $python ]]; then + python="/usr/bin/python3" + rmsigchks="$(which python2) rmsigchks.py" + SimpleHTTPServer="$python -m http.server 8888" + fi fi Log "Running on platform: $platform ($platformver)" diff --git a/resources/device.sh b/resources/device.sh index d69fcdb..2fab3a2 100755 --- a/resources/device.sh +++ b/resources/device.sh @@ -174,7 +174,7 @@ CheckM8() { local pwnD=1 if [[ $platform == "macos" ]]; then - Selection=("iPwnder32" "ipwnder_lite" "ipwndfu") + Selection=("iPwnder32" "ipwnder_lite") 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." @@ -203,6 +203,11 @@ CheckM8() { cd ../.. else cd ../.. + if [[ $platform == "macos" ]]; then + Echo "* Attempting to send pwned iBSS." + Echo "* This will fail on Apple Silicon Macs, as well as on macOS 12.3 and later." + Echo "* For more details, read the \"Troubleshooting\" wiki page in GitHub" + fi Log "Sending iBSS..." kDFU iBSS || echo pwnDFUDevice=$?