From cf6eb714c4e9c13ab234e8ca846614ee5b072704 Mon Sep 17 00:00:00 2001 From: kzolotarev95 Date: Wed, 8 Jul 2026 23:10:37 +0400 Subject: [PATCH] Fix Xray install for MIPS targets --- files/usr/sbin/owrt-remote | 52 +++++++++++++++++++++++++++++++++++++- install.sh | 11 ++++++++ 2 files changed, 62 insertions(+), 1 deletion(-) diff --git a/files/usr/sbin/owrt-remote b/files/usr/sbin/owrt-remote index 4264bdd..ac5512d 100644 --- a/files/usr/sbin/owrt-remote +++ b/files/usr/sbin/owrt-remote @@ -267,14 +267,64 @@ fetch_file() { die "для скачивания нужен wget или curl" } +xray_arch() { + local arch + arch="$(uname -m 2>/dev/null || true)" + + case "$arch" in + mips|mips64|mips64el|mips64le|mipsel|mipsle|'') ;; + *) + printf '%s\n' "$arch" + return + ;; + esac + + if command -v opkg >/dev/null 2>&1; then + arch="$( + opkg print-architecture 2>/dev/null | awk ' + $1 == "arch" && $2 != "all" && $2 != "noarch" { + priority = $3 + 0 + if (priority >= best_priority) { + best = $2 + best_priority = priority + } + } + END { + if (best != "") { + print best + } + } + ' + )" + [ -n "$arch" ] && { + printf '%s\n' "$arch" + return + } + fi + + if command -v apk >/dev/null 2>&1; then + arch="$(apk --print-arch 2>/dev/null || true)" + [ -n "$arch" ] && { + printf '%s\n' "$arch" + return + } + fi + + printf '%s\n' "$arch" +} + xray_release_asset() { - case "$(uname -m 2>/dev/null)" in + case "$(xray_arch)" in aarch64|arm64) printf '%s\n' "Xray-linux-arm64-v8a.zip" ;; armv7l|armv7*) printf '%s\n' "Xray-linux-arm32-v7a.zip" ;; armv6l|armv6*) printf '%s\n' "Xray-linux-arm32-v6.zip" ;; armv5l|armv5*) printf '%s\n' "Xray-linux-arm32-v5.zip" ;; x86_64|amd64) printf '%s\n' "Xray-linux-64.zip" ;; i386|i686) printf '%s\n' "Xray-linux-32.zip" ;; + mips64el|mips64le|mips64el_*|mips64le_*) printf '%s\n' "Xray-linux-mips64le.zip" ;; + mips64|mips64_*) printf '%s\n' "Xray-linux-mips64.zip" ;; + mipsel*|mipsle*) printf '%s\n' "Xray-linux-mips32le.zip" ;; + mips*) printf '%s\n' "Xray-linux-mips32.zip" ;; *) return 1 ;; esac } diff --git a/install.sh b/install.sh index 2b486bd..e1addac 100644 --- a/install.sh +++ b/install.sh @@ -134,6 +134,15 @@ package_manager() { printf 'unknown' } +install_xray_runtime() { + local remote_bin + [ "${ROOT%/}" = "" ] || return 0 + remote_bin="$(target_path usr/sbin/owrt-remote)" + [ -x "$remote_bin" ] || die "missing $remote_bin after install" + info "Installing Xray to /tmp..." + "$remote_bin" install-xray-tmp || die "failed to install Xray to /tmp" +} + install_file "usr/sbin/owrt-remote" 0755 install_file "etc/init.d/owrt-remote" 0755 install_config @@ -153,6 +162,8 @@ if [ -x "$(target_path etc/init.d/uhttpd)" ]; then "$(target_path etc/init.d/uhttpd)" reload >/dev/null 2>&1 || "$(target_path etc/init.d/uhttpd)" restart >/dev/null 2>&1 || true fi +install_xray_runtime + key="$(make_key)" ip="$(router_ip)" ui_version="$(installed_ui_version)"