Workaround python2 removal in macOS 12.3

not tested
This commit is contained in:
LukeZGD 2022-03-16 11:42:58 +08:00
parent 0bd069df62
commit a170ec5376
3 changed files with 13 additions and 1 deletions

View File

@ -73,6 +73,7 @@
- [imobiledevice-net](https://github.com/libimobiledevice-win32/imobiledevice-net) - libimobiledevice-win32 (macOS build) - [imobiledevice-net](https://github.com/libimobiledevice-win32/imobiledevice-net) - libimobiledevice-win32 (macOS build)
- ipsw tool from [xpwn](https://github.com/LukeZGD/xpwn) - LukeZGD fork - ipsw tool from [xpwn](https://github.com/LukeZGD/xpwn) - LukeZGD fork
- Python 2 (for ipwndfu, rmsigchks, SimpleHTTPServer) - Python 2 (for ipwndfu, rmsigchks, SimpleHTTPServer)
- Python 3 (http.server)
- [tsschecker](https://github.com/tihmstar/tsschecker) - tihmstar - [tsschecker](https://github.com/tihmstar/tsschecker) - tihmstar
- [futurerestore](https://github.com/m1stadev/futurerestore/tree/test) - m1stadev fork - [futurerestore](https://github.com/m1stadev/futurerestore/tree/test) - m1stadev fork
- [kloader](https://www.youtube.com/watch?v=fh0tB6fp0Sc) - [kloader](https://www.youtube.com/watch?v=fh0tB6fp0Sc)

View File

@ -62,6 +62,12 @@ SetToolPaths() {
ipwndfu="sudo $ipwndfu" ipwndfu="sudo $ipwndfu"
irecovery="sudo LD_LIBRARY_PATH=./resources/lib $irecovery" irecovery="sudo LD_LIBRARY_PATH=./resources/lib $irecovery"
rmsigchks="sudo $rmsigchks" 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 fi
Log "Running on platform: $platform ($platformver)" Log "Running on platform: $platform ($platformver)"

View File

@ -174,7 +174,7 @@ CheckM8() {
local pwnD=1 local pwnD=1
if [[ $platform == "macos" ]]; then if [[ $platform == "macos" ]]; then
Selection=("iPwnder32" "ipwnder_lite" "ipwndfu") Selection=("iPwnder32" "ipwnder_lite")
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."
Echo "* If unsure, select 1 for Intel Macs, select 2 for Apple Silicon (M1) Macs." Echo "* If unsure, select 1 for Intel Macs, select 2 for Apple Silicon (M1) Macs."
@ -203,6 +203,11 @@ CheckM8() {
cd ../.. cd ../..
else else
cd ../.. 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..." Log "Sending iBSS..."
kDFU iBSS || echo kDFU iBSS || echo
pwnDFUDevice=$? pwnDFUDevice=$?