@@ -2530,23 +2530,34 @@ python3_init() {
25302530
25312531device_fw_key_server() {
25322532 local wikiproxy="wikiproxy-go_$platform-$(uname -m)"
2533+ local wikiproxy_ipw="wikiproxy-go-ipw_$platform-$(uname -m)"
2534+ local port=8889
25332535
2534- if [[ ! -s $wikiproxy ]]; then
2536+ if [[ ! -s ../saved/ $wikiproxy || ! -s ../saved/$wikiproxy_ipw ]]; then
25352537 file_download https://github.com/LukeZGD/wikiproxy-go/releases/download/latest/$wikiproxy.zip $wikiproxy.zip
25362538 file_extract $wikiproxy.zip
2537- if [[ ! -s main ]]; then
2539+ if [[ ! -s main || ! -s main-ipw ]]; then
25382540 error "wikiproxy failed to download. Please run the script again"
25392541 fi
25402542 mv main ../saved/$wikiproxy
2543+ mv main-ipw ../saved/$wikiproxy_ipw
2544+ fi
2545+
2546+ if [[ $1 == "ipw" ]]; then
2547+ wikiproxy="$wikiproxy_ipw"
2548+ port=8890
2549+ fi
2550+ if [[ -n $httpserver_pid ]]; then
2551+ kill $httpserver_pid
25412552 fi
25422553
25432554 log "Running wikiproxy..."
2544- ../saved/$wikiproxy &
2555+ ../saved/$wikiproxy $port &
25452556 httpserver_pid=$!
25462557
25472558 log "Waiting for local server"
25482559 while true; do
2549- if $curl -sS http://127.0.0.1:8888 >/dev/null 2>&1; then
2560+ if $curl -sS http://127.0.0.1:$port >/dev/null 2>&1; then
25502561 break
25512562 fi
25522563
@@ -2588,10 +2599,11 @@ device_fw_key_check() {
25882599
25892600 if [[ ! -e "$keys_path/index.html" ]]; then
25902601 mkdir -p "$keys_path"
2591- local try=("https ://raw.githubusercontent.com/LukeZGD/Legacy-iOS-Kit-Keys/master/ $device_type/$build/index.html "
2592- "http://127.0.0.1:8888 /firmware/$device_type/$build")
2602+ local try=("http ://127.0.0.1:8889/firmware/ $device_type/$build"
2603+ "http://127.0.0.1:8890 /firmware/$device_type/$build")
25932604 for i in "${try[@]}"; do
2594- [[ $i == *"127.0.0.1:8888"* ]] && device_fw_key_server
2605+ [[ $i == *"127.0.0.1:8889"* ]] && device_fw_key_server
2606+ [[ $i == *"127.0.0.1:8890"* ]] && device_fw_key_server ipw
25952607 log "Getting firmware keys for $device_type-$build: $i"
25962608 download_from_url "$i" index.html
25972609 if [[ $(cat index.html | grep -c "$build") == 1 ]]; then
0 commit comments