Use Xray softfloat on MIPS routers
This commit is contained in:
1 parent
cf6eb714c4
commit
643be7b5f2
1 file changed
+26
-16
+26
-16
@@ -238,7 +238,7 @@ xray_bin_path() {
|
|||||||
printf '%s' "$configured"
|
printf '%s' "$configured"
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
for candidate in /usr/bin/xray /usr/bin/xray-core /usr/local/bin/xray /opt/bin/xray /tmp/owrt-xray/xray /tmp/xray; do
|
for candidate in /usr/bin/xray /usr/bin/xray-core /usr/local/bin/xray /opt/bin/xray /tmp/owrt-xray/xray /tmp/owrt-xray/xray_softfloat /tmp/xray /tmp/xray_softfloat; do
|
||||||
if [ -x "$candidate" ]; then
|
if [ -x "$candidate" ]; then
|
||||||
printf '%s' "$candidate"
|
printf '%s' "$candidate"
|
||||||
return
|
return
|
||||||
@@ -768,7 +768,7 @@ ensure_fetch_tool() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
install_xray_tmp() {
|
install_xray_tmp() {
|
||||||
local dir zip asset url version
|
local dir zip asset url version entry candidates
|
||||||
dir="/tmp/owrt-xray"
|
dir="/tmp/owrt-xray"
|
||||||
zip="$dir/xray.zip"
|
zip="$dir/xray.zip"
|
||||||
asset="$(xray_release_asset)" || {
|
asset="$(xray_release_asset)" || {
|
||||||
@@ -791,7 +791,7 @@ install_xray_tmp() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
printf 'Skachivayu Xray: %s\n' "$asset"
|
printf 'Skachivayu Xray: %s\n' "$asset"
|
||||||
rm -f "$zip" "$dir/xray"
|
rm -f "$zip" "$dir/xray" "$dir/xray_softfloat"
|
||||||
fetch_file "$url" "$zip" || {
|
fetch_file "$url" "$zip" || {
|
||||||
log "cannot download Xray: $url"
|
log "cannot download Xray: $url"
|
||||||
return 1
|
return 1
|
||||||
@@ -801,25 +801,35 @@ install_xray_tmp() {
|
|||||||
rm -f "$zip"
|
rm -f "$zip"
|
||||||
return 1
|
return 1
|
||||||
}
|
}
|
||||||
( cd "$dir" && unzip -o "$zip" xray >/dev/null ) || {
|
|
||||||
log "cannot unpack Xray"
|
candidates="xray"
|
||||||
rm -f "$zip" "$dir/xray"
|
case "$(xray_arch)" in
|
||||||
return 1
|
mips*)
|
||||||
}
|
candidates="xray_softfloat xray"
|
||||||
chmod +x "$dir/xray"
|
;;
|
||||||
version="$("$dir/xray" version 2>&1)" || {
|
esac
|
||||||
log "downloaded Xray does not start"
|
|
||||||
rm -f "$dir/xray"
|
for entry in $candidates; do
|
||||||
return 1
|
( cd "$dir" && unzip -o "$zip" "$entry" >/dev/null ) || continue
|
||||||
|
[ -s "$dir/$entry" ] || continue
|
||||||
|
chmod +x "$dir/$entry"
|
||||||
|
version="$("$dir/$entry" version 2>&1)" || {
|
||||||
|
rm -f "$dir/$entry"
|
||||||
|
continue
|
||||||
}
|
}
|
||||||
version="$(printf '%s\n' "$version" | sed -n '1p')"
|
version="$(printf '%s\n' "$version" | sed -n '1p')"
|
||||||
|
|
||||||
uci set "$CONFIG.$SECTION.xray_bin=$dir/xray"
|
uci set "$CONFIG.$SECTION.xray_bin=$dir/$entry"
|
||||||
uci commit "$CONFIG"
|
uci commit "$CONFIG"
|
||||||
printf 'OK: Xray installed in %s\n' "$dir/xray"
|
printf 'OK: Xray installed in %s\n' "$dir/$entry"
|
||||||
printf 'OK: %s\n' "$version"
|
printf 'OK: %s\n' "$version"
|
||||||
printf 'OK: xray_bin saved in /etc/config/owrtremote\n'
|
printf 'OK: xray_bin saved in /etc/config/owrtremote\n'
|
||||||
return 0
|
return 0
|
||||||
|
done
|
||||||
|
|
||||||
|
log "downloaded Xray does not start"
|
||||||
|
rm -f "$dir/xray" "$dir/xray_softfloat"
|
||||||
|
return 1
|
||||||
}
|
}
|
||||||
|
|
||||||
ensure_xray_available() {
|
ensure_xray_available() {
|
||||||
@@ -827,7 +837,7 @@ ensure_xray_available() {
|
|||||||
configured="$(uci_get xray_bin /usr/bin/xray)"
|
configured="$(uci_get xray_bin /usr/bin/xray)"
|
||||||
[ -x "$configured" ] && return 0
|
[ -x "$configured" ] && return 0
|
||||||
|
|
||||||
for candidate in /usr/bin/xray /usr/bin/xray-core /usr/local/bin/xray /opt/bin/xray /tmp/owrt-xray/xray /tmp/xray; do
|
for candidate in /usr/bin/xray /usr/bin/xray-core /usr/local/bin/xray /opt/bin/xray /tmp/owrt-xray/xray /tmp/owrt-xray/xray_softfloat /tmp/xray /tmp/xray_softfloat; do
|
||||||
if [ -x "$candidate" ]; then
|
if [ -x "$candidate" ]; then
|
||||||
found="$candidate"
|
found="$candidate"
|
||||||
break
|
break
|
||||||
|
|||||||
Reference in new issue
Block a user