Mirrors/Legacy-iOS-Kit
2
0
Fork 0
mirror of https://github.com/LukeZGD/Legacy-iOS-Kit.git synced 2024-11-27 10:24:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Better error detection for ipwndfu

Browse Source
This commit is contained in:
LukeZGD 2023-01-22 13:12:36 +08:00
parent 8e9995f42a
commit 75348d8cbd
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
restore.sh
View File

@ -830,17 +830,18 @@ device_ipwndfu() {
local tool_pwned=0 local tool_pwned=0
local mac_ver=0 local mac_ver=0
local python2=$(which python2 2>/dev/null) local python2=$(which python2 2>/dev/null)
print "* Make sure to have python2 installed to use ipwndfu"
print "* You may install python2 from pyenv: pyenv install 2.7.18"
if [[ $platform == "macos" ]]; then if [[ $platform == "macos" ]]; then
mac_ver=$(echo "$platform_ver" | cut -c -2) mac_ver=$(echo "$platform_ver" | cut -c -2)
fi fi
if [[ $platform == "macos" ]] && (( mac_ver < 12 )); then if [[ $platform == "macos" ]] && (( mac_ver < 12 )); then
python2=/usr/bin/python python2=/usr/bin/python
elif [[ -e ~/.pyenv/shims/python2 ]]; then elif [[ -e ~/.pyenv/versions/2.7.18/bin/python2 ]]; then
print "* python2 from pyenv detected" log "python2 from pyenv detected"
python2=~/.pyenv/shims/python2 python2=~/.pyenv/versions/2.7.18/bin/python2
elif [[ -z $python2 ]]; then
error "Python 2 is not installed, cannot continue. Make sure to have python2 installed to use ipwndfu." \
"You may install python2 from pyenv: pyenv install 2.7.18"
fi fi
device_enter_mode DFU device_enter_mode DFU
@ -1384,12 +1385,12 @@ shsh_save() {
fi fi
shsh_check=${device_ecid}_${device_type}_${device_model}ap_${version}-${build_id}_*.shsh* shsh_check=${device_ecid}_${device_type}_${device_model}ap_${version}-${build_id}_*.shsh*
if [[ $(ls ../saved/shsh/$shsh_check) && -z $apnonce ]]; then if [[ $(ls ../saved/shsh/$shsh_check 2>/dev/null) && -z $apnonce ]]; then
shsh_path="$(ls ../saved/shsh/$shsh_check)" shsh_path="$(ls ../saved/shsh/$shsh_check)"
log "Found existing saved $version blobs: $shsh_path" log "Found existing saved $version blobs: $shsh_path"
return return
fi fi
rm *.shsh* rm *.shsh* 2>/dev/null
ExtraArgs="-d $device_type -i $version -e $device_ecid -m $buildmanifest -o -s -B ${device_model}ap -b " ExtraArgs="-d $device_type -i $version -e $device_ecid -m $buildmanifest -o -s -B ${device_model}ap -b "
if [[ -n $apnonce ]]; then if [[ -n $apnonce ]]; then