Skip to content

Commit 8140287

Browse files
committed
use wikiproxy go instead of wikiproxy python
1 parent f8192b6 commit 8140287

1 file changed

Lines changed: 13 additions & 32 deletions

File tree

restore.sh

Lines changed: 13 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -2529,40 +2529,19 @@ python3_init() {
25292529
}
25302530

25312531
device_fw_key_server() {
2532-
local venv_name
2533-
local venv
2534-
local repo="m1stadev"
2535-
local error_msg=
2536-
2537-
python3_init
2538-
if (( python_minver <= 13 )); then
2539-
repo="LukeZGD"
2540-
fi
2541-
venv_name="wikiproxy-${repo}_venv"
2542-
venv="../saved/$venv_name"
2543-
2544-
# remove old venv
2545-
if [[ -d "../saved/wikiproxy_venv" ]]; then
2546-
rm -r "../saved/wikiproxy_venv"
2547-
fi
2532+
local wikiproxy="wikiproxy-go_$platform-$(uname -m)"
25482533

2549-
if [[ ! -d $venv || ! -s $venv/bin/python3 ]]; then
2550-
log "Creating venv for wikiproxy"
2551-
python3 -m venv "$venv"
2552-
fi
2553-
if [[ ! -d $venv || ! -s $venv/bin/python3 ]]; then
2554-
warn "Creation of venv seems to have failed. wikiproxy will not run."
2555-
warn "If you do not have Python 3 installed, install it since wikiproxy requires it."
2556-
return
2557-
fi
2558-
2559-
if [[ ! -s $venv/bin/wikiproxy ]]; then
2560-
log "Installing wikiproxy using pip..."
2561-
"$venv/bin/pip" install "git+https://github.com/${repo}/wikiproxy.git"
2534+
if [[ ! -s $wikiproxy ]]; then
2535+
file_download https://github.com/LukeZGD/wikiproxy-go/releases/download/latest/$wikiproxy.zip $wikiproxy.zip
2536+
file_extract $wikiproxy.zip
2537+
if [[ ! -s main ]]; then
2538+
error "wikiproxy failed to download. Please run the script again"
2539+
fi
2540+
mv main ../saved/$wikiproxy
25622541
fi
25632542

25642543
log "Running wikiproxy..."
2565-
"$(cd .. && pwd)/saved/$venv_name/bin/wikiproxy" &
2544+
../saved/$wikiproxy &
25662545
httpserver_pid=$!
25672546

25682547
log "Waiting for local server"
@@ -2627,8 +2606,10 @@ device_fw_key_check() {
26272606
error "Failed to download firmware keys." "$error_msg"
26282607
fi
26292608
mv index.html "$keys_path/"
2630-
log "Stopping wikiproxy server"
2631-
[[ -n $httpserver_pid ]] && kill $httpserver_pid && wait $httpserver_pid
2609+
if [[ -n $httpserver_pid ]]; then
2610+
log "Stopping wikiproxy server"
2611+
kill $httpserver_pid && wait $httpserver_pid
2612+
fi
26322613
fi
26332614
# workaround for some futurerestore/libipatcher issue/feature
26342615
mkdir -p "$device_fw_dir/${device_model}ap/$build/" "$device_fw_dir/$device_type/$build/"

0 commit comments

Comments
 (0)