mirror of
https://github.com/2dust/v2rayN.git
synced 2026-05-17 20:54:36 +03:00
Update .NET 10 (#9239)
* Update dotnet to 10 * Update .NET version in build workflow * Update build-osx.yml * Update package-zip.yml * Update package-rhel.sh * Update print statement from 'Hello' to 'Goodbye' * Update package-rhel-riscv.sh * Create package-debian-riscv.sh * Update build-linux.yml * Create update-riscv-depand.yml * Update update-riscv-depand.yml * Update ServiceLib.csproj * Update Directory.Packages.props * Update UpdateService.cs * Update UpdateService.cs * Update Directory.Packages.props * Update ServiceLib.csproj * Replace SourceGear.sqlite3 with Repobot.SQLite.Unofficial * Replace SourceGear.sqlite3 with Repobot.SQLite.Unofficial * Update Repobot.SQLite.Unofficial version to 3.53.1.1 * Update package-zip.yml * Update build-osx.yml Adjust sleep duration to reduce race condition likelihood. * Update Directory.Packages.props * Update Directory.Packages.props * Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: DHR60 <dehongren60@gmail.com> Co-authored-by: xujie86 <167618598+xujie86@users.noreply.github.com> Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
This commit is contained in:
JieXu
@@ -251,3 +251,77 @@ jobs:
|
|||||||
--data-binary @"$f" \
|
--data-binary @"$f" \
|
||||||
"${upload_url}?name=${f##*/}"
|
"${upload_url}?name=${f##*/}"
|
||||||
done
|
done
|
||||||
|
|
||||||
|
deb-riscv64:
|
||||||
|
name: build and release deb riscv64
|
||||||
|
if: |
|
||||||
|
(github.event_name == 'workflow_dispatch' && inputs.release_tag != '') ||
|
||||||
|
(github.event_name == 'push' && startsWith(github.ref, 'refs/tags/'))
|
||||||
|
runs-on: ubuntu-24.04-riscv
|
||||||
|
container: debian:13
|
||||||
|
env:
|
||||||
|
RELEASE_TAG: ${{ case(inputs.release_tag != '', inputs.release_tag, github.ref_name) }}
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: Prepare tools (Debian)
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
export DEBIAN_FRONTEND=noninteractive
|
||||||
|
apt-get update
|
||||||
|
apt-get install -y sudo git rsync findutils tar gzip unzip which curl jq wget file \
|
||||||
|
ca-certificates desktop-file-utils xdg-utils fakeroot dpkg-dev \
|
||||||
|
gcc make libc6-dev libgcc-s1 libstdc++6 zlib1g libatomic1
|
||||||
|
|
||||||
|
- name: Checkout repo (for scripts)
|
||||||
|
shell: bash
|
||||||
|
env:
|
||||||
|
GITHUB_TOKEN: ${{ github.token }}
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
rm -rf ./*
|
||||||
|
git init .
|
||||||
|
git config --global --add safe.directory "$PWD"
|
||||||
|
git remote add origin "https://x-access-token:${GITHUB_TOKEN}@github.com/${GITHUB_REPOSITORY}.git"
|
||||||
|
git fetch --depth=1 origin "${GITHUB_SHA}"
|
||||||
|
git checkout FETCH_HEAD
|
||||||
|
git submodule update --init --recursive
|
||||||
|
|
||||||
|
- name: Ensure script permissions
|
||||||
|
run: chmod 755 package-debian-riscv.sh
|
||||||
|
|
||||||
|
- name: Package DEB (Debian-family)
|
||||||
|
run: ./package-debian-riscv.sh "${RELEASE_TAG}"
|
||||||
|
|
||||||
|
- name: Collect DEBs into workspace
|
||||||
|
run: |
|
||||||
|
mkdir -p "$GITHUB_WORKSPACE/dist/deb-riscv64"
|
||||||
|
rsync -av "$HOME/debbuild/" "$GITHUB_WORKSPACE/dist/deb-riscv64/" || true
|
||||||
|
find "$GITHUB_WORKSPACE/dist/deb-riscv64" -name "*.deb" \
|
||||||
|
-exec mv {} "$GITHUB_WORKSPACE/dist/deb-riscv64/v2rayN-linux-riscv64.deb" \; || true
|
||||||
|
echo "==== Dist tree ===="
|
||||||
|
ls -R "$GITHUB_WORKSPACE/dist/deb-riscv64" || true
|
||||||
|
|
||||||
|
- name: Upload DEBs to release
|
||||||
|
shell: bash
|
||||||
|
env:
|
||||||
|
GITHUB_TOKEN: ${{ github.token }}
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
shopt -s globstar nullglob
|
||||||
|
|
||||||
|
files=(dist/deb-riscv64/**/*.deb)
|
||||||
|
(( ${#files[@]} )) || { echo "No DEBs found."; exit 1; }
|
||||||
|
|
||||||
|
api="${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/releases/tags/${RELEASE_TAG}"
|
||||||
|
upload_url="$(curl -fsSL -H "Authorization: Bearer ${GITHUB_TOKEN}" "$api" | jq -r '.upload_url // empty' | sed 's/{?name,label}//')"
|
||||||
|
[[ "$upload_url" ]] || { echo "Release upload URL not found: ${RELEASE_TAG}"; exit 1; }
|
||||||
|
|
||||||
|
for f in "${files[@]}"; do
|
||||||
|
echo "Uploading ${f##*/}"
|
||||||
|
curl -fsSL -X POST \
|
||||||
|
-H "Authorization: Bearer ${GITHUB_TOKEN}" \
|
||||||
|
-H "Content-Type: application/vnd.debian.binary-package" \
|
||||||
|
--data-binary @"$f" \
|
||||||
|
"${upload_url}?name=${f##*/}"
|
||||||
|
done
|
||||||
|
|||||||
@@ -63,7 +63,7 @@ jobs:
|
|||||||
run: ./package-osx.sh macos-$Arch v2rayN-macos-$Arch ${{ inputs.release_tag }}
|
run: ./package-osx.sh macos-$Arch v2rayN-macos-$Arch ${{ inputs.release_tag }}
|
||||||
|
|
||||||
- name: Sleep for race condition between matrix jobs
|
- name: Sleep for race condition between matrix jobs
|
||||||
run: sleep $(awk 'BEGIN { srand(); printf "%.3f", rand()*2 }')
|
run: sleep "$(od -An -N2 -tu2 /dev/urandom | awk 'NR==1{printf "%.2f", $1/5461}')"
|
||||||
|
|
||||||
- name: Upload dmg to release
|
- name: Upload dmg to release
|
||||||
uses: svenstaro/upload-release-action@v2
|
uses: svenstaro/upload-release-action@v2
|
||||||
|
|||||||
@@ -54,7 +54,7 @@ jobs:
|
|||||||
- name: Setup .NET
|
- name: Setup .NET
|
||||||
uses: actions/setup-dotnet@v5.2.0
|
uses: actions/setup-dotnet@v5.2.0
|
||||||
with:
|
with:
|
||||||
dotnet-version: '10.0.x'
|
dotnet-version: '10.0.1xx'
|
||||||
|
|
||||||
- name: Build v2rayN
|
- name: Build v2rayN
|
||||||
working-directory: ./v2rayN
|
working-directory: ./v2rayN
|
||||||
@@ -68,4 +68,4 @@ jobs:
|
|||||||
uses: actions/upload-artifact@v7.0.1
|
uses: actions/upload-artifact@v7.0.1
|
||||||
with:
|
with:
|
||||||
name: ${{ matrix.arch }}
|
name: ${{ matrix.arch }}
|
||||||
path: ${{ matrix.arch }}
|
path: ${{ matrix.arch }}
|
||||||
@@ -56,8 +56,8 @@ jobs:
|
|||||||
run: mv "v2rayN-$Target-$Arch.zip" "v2rayN-$Target-$Arch-desktop.zip"
|
run: mv "v2rayN-$Target-$Arch.zip" "v2rayN-$Target-$Arch-desktop.zip"
|
||||||
|
|
||||||
- name: Sleep for race condition between matrix jobs
|
- name: Sleep for race condition between matrix jobs
|
||||||
run: sleep $(awk 'BEGIN { srand(); printf "%.3f", rand()*2 }')
|
run: sleep "$(od -An -N2 -tu2 /dev/urandom | awk 'NR==1{printf "%.2f", $1/5461}')"
|
||||||
|
|
||||||
- name: Upload zip archive to release
|
- name: Upload zip archive to release
|
||||||
uses: svenstaro/upload-release-action@v2
|
uses: svenstaro/upload-release-action@v2
|
||||||
with:
|
with:
|
||||||
|
|||||||
@@ -0,0 +1,256 @@
|
|||||||
|
name: update riscv dependent versions
|
||||||
|
|
||||||
|
on:
|
||||||
|
workflow_dispatch:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- master
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: write
|
||||||
|
|
||||||
|
concurrency:
|
||||||
|
group: update-riscv-dependent
|
||||||
|
cancel-in-progress: false
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
update:
|
||||||
|
runs-on: ubuntu-24.04
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v5
|
||||||
|
|
||||||
|
- uses: actions/setup-dotnet@v5
|
||||||
|
with:
|
||||||
|
dotnet-version: 10.0.1xx
|
||||||
|
|
||||||
|
- run: sudo apt-get update && sudo apt-get install -y jq
|
||||||
|
|
||||||
|
- name: resolve
|
||||||
|
id: resolve
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
TARGET_FILES=(
|
||||||
|
package-rhel-riscv.sh
|
||||||
|
package-debian-riscv.sh
|
||||||
|
)
|
||||||
|
|
||||||
|
echo "==> restore projects"
|
||||||
|
find . -name '*.csproj' | while read -r p; do
|
||||||
|
if grep -q '<TargetFramework>.*-windows' "$p"; then
|
||||||
|
echo "[skip] $p"
|
||||||
|
else
|
||||||
|
echo "[restore] $p"
|
||||||
|
dotnet restore "$p" -p:EnableWindowsTargeting=true || true
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
echo "==> collect assets"
|
||||||
|
mapfile -t ASSETS < <(find . -path '*/obj/project.assets.json')
|
||||||
|
printf ' %s\n' "${ASSETS[@]}"
|
||||||
|
|
||||||
|
ALL_LIBS=()
|
||||||
|
for f in "${ASSETS[@]}"; do
|
||||||
|
mapfile -t libs < <(jq -r '.libraries | keys[]' "$f")
|
||||||
|
ALL_LIBS+=("${libs[@]}")
|
||||||
|
done
|
||||||
|
mapfile -t LIBS < <(printf '%s\n' "${ALL_LIBS[@]}" | sort -u)
|
||||||
|
|
||||||
|
extract() {
|
||||||
|
local name="$1"
|
||||||
|
for i in "${LIBS[@]}"; do
|
||||||
|
[[ "$i" == "$name/"* ]] && echo "${i#*/}"
|
||||||
|
done | sort -u
|
||||||
|
}
|
||||||
|
|
||||||
|
norm_version() { echo "${1#v}"; }
|
||||||
|
is_preview() { [[ "$(norm_version "$1")" == *-* ]]; }
|
||||||
|
base_version() { local v; v="$(norm_version "$1")"; echo "${v%%-*}"; }
|
||||||
|
|
||||||
|
key() {
|
||||||
|
local v core pre a b c p1 p2 p3
|
||||||
|
v="$(norm_version "$1")"
|
||||||
|
core="${v%%-*}"
|
||||||
|
[[ "$v" == *-* ]] && pre="${v#*-}" || pre=""
|
||||||
|
|
||||||
|
IFS='.' read -r a b c <<< "$core"
|
||||||
|
a=${a//[^0-9]/}; a=${a:-0}
|
||||||
|
b=${b//[^0-9]/}; b=${b:-0}
|
||||||
|
c=${c//[^0-9]/}; c=${c:-0}
|
||||||
|
|
||||||
|
if [[ -z "$pre" ]]; then
|
||||||
|
printf "%05d.%05d.%05d.1\n" "$a" "$b" "$c"
|
||||||
|
else
|
||||||
|
pre="${pre#preview.}"
|
||||||
|
IFS='.' read -ra p <<< "$pre"
|
||||||
|
p1=${p[0]:-0}; p1=${p1//[^0-9]/}; p1=${p1:-0}
|
||||||
|
p2=${p[1]:-0}; p2=${p2//[^0-9]/}; p2=${p2:-0}
|
||||||
|
p3=${p[2]:-0}; p3=${p3//[^0-9]/}; p3=${p3:-0}
|
||||||
|
printf "%05d.%05d.%05d.0.%05d.%05d.%05d\n" \
|
||||||
|
"$a" "$b" "$c" "$p1" "$p2" "$p3"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
latest() {
|
||||||
|
local best="" best_key="" cur cur_key
|
||||||
|
for cur in "$@"; do
|
||||||
|
[[ -n "$cur" ]] || continue
|
||||||
|
cur_key="$(key "$cur")"
|
||||||
|
echo " candidate: $cur -> $cur_key" >&2
|
||||||
|
if [[ -z "$best_key" || "$cur_key" > "$best_key" ]]; then
|
||||||
|
best="$cur"
|
||||||
|
best_key="$cur_key"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
echo "$best"
|
||||||
|
}
|
||||||
|
|
||||||
|
log_mixed_versions() {
|
||||||
|
local name="$1"; shift
|
||||||
|
local versions=("$@") bases=() v b
|
||||||
|
mapfile -t bases < <(
|
||||||
|
for v in "${versions[@]}"; do
|
||||||
|
[[ -n "$v" ]] && base_version "$v"
|
||||||
|
done | sort -u
|
||||||
|
)
|
||||||
|
|
||||||
|
for b in "${bases[@]}"; do
|
||||||
|
local has_stable=0 has_preview=0 matched=()
|
||||||
|
for v in "${versions[@]}"; do
|
||||||
|
[[ -n "$v" ]] || continue
|
||||||
|
[[ "$(base_version "$v")" == "$b" ]] || continue
|
||||||
|
matched+=("$v")
|
||||||
|
if is_preview "$v"; then
|
||||||
|
has_preview=1
|
||||||
|
else
|
||||||
|
has_stable=1
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
if [[ "$has_stable" -eq 1 && "$has_preview" -eq 1 ]]; then
|
||||||
|
echo "[warn] $name: stable and preview both exist for base $b, prefer stable for this base" >&2
|
||||||
|
printf ' %s\n' "${matched[@]}" >&2
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
|
filter_mixed_versions() {
|
||||||
|
local versions=("$@") stable_bases=() v b
|
||||||
|
mapfile -t stable_bases < <(
|
||||||
|
for v in "${versions[@]}"; do
|
||||||
|
if [[ -n "$v" ]] && ! is_preview "$v"; then
|
||||||
|
base_version "$v"
|
||||||
|
fi
|
||||||
|
done | sort -u
|
||||||
|
)
|
||||||
|
|
||||||
|
for v in "${versions[@]}"; do
|
||||||
|
[[ -n "$v" ]] || continue
|
||||||
|
b="$(base_version "$v")"
|
||||||
|
if is_preview "$v" && printf '%s\n' "${stable_bases[@]}" | grep -qxF "$b"; then
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
echo "$v"
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
|
read_var() {
|
||||||
|
sed -nE "s/^$2=\"\\\$\\{$2:-([^\"]+)\\}\".*/\\1/p" "$1" | head -n1
|
||||||
|
}
|
||||||
|
|
||||||
|
choose_final_version() {
|
||||||
|
local old="$1" new="$2"
|
||||||
|
[[ -n "$new" ]] || { echo "$old"; return; }
|
||||||
|
[[ -n "$old" ]] || { echo "$new"; return; }
|
||||||
|
if [[ "$(key "$old")" > "$(key "$new")" ]]; then
|
||||||
|
echo "$old"
|
||||||
|
else
|
||||||
|
echo "$new"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
update_file() {
|
||||||
|
local file="$1"
|
||||||
|
local old_skia old_harf final_skia final_harf changed=0
|
||||||
|
|
||||||
|
old_skia="$(read_var "$file" SKIA_VER)"
|
||||||
|
old_harf="$(read_var "$file" HARFBUZZ_VER)"
|
||||||
|
final_skia="$(choose_final_version "$old_skia" "$NEW_SKIA")"
|
||||||
|
final_harf="$(choose_final_version "$old_harf" "$NEW_HARF")"
|
||||||
|
|
||||||
|
echo "==> check $file"
|
||||||
|
echo " SKIA_VER: ${old_skia} -> ${NEW_SKIA} (apply: ${final_skia})"
|
||||||
|
echo " HARFBUZZ_VER: ${old_harf} -> ${NEW_HARF} (apply: ${final_harf})"
|
||||||
|
|
||||||
|
if [[ "$old_skia" != "$final_skia" ]]; then
|
||||||
|
sed -i -E "s|^SKIA_VER=.*|SKIA_VER=\"\\\${SKIA_VER:-$final_skia}\"|" "$file"
|
||||||
|
changed=1
|
||||||
|
fi
|
||||||
|
if [[ "$old_harf" != "$final_harf" ]]; then
|
||||||
|
sed -i -E "s|^HARFBUZZ_VER=.*|HARFBUZZ_VER=\"\\\${HARFBUZZ_VER:-$final_harf}\"|" "$file"
|
||||||
|
changed=1
|
||||||
|
fi
|
||||||
|
|
||||||
|
grep -qF "SKIA_VER=\"\${SKIA_VER:-$final_skia}\"" "$file"
|
||||||
|
grep -qF "HARFBUZZ_VER=\"\${HARFBUZZ_VER:-$final_harf}\"" "$file"
|
||||||
|
bash -n "$file"
|
||||||
|
|
||||||
|
[[ "$changed" -eq 1 ]]
|
||||||
|
}
|
||||||
|
|
||||||
|
mapfile -t SKIA < <(extract SkiaSharp)
|
||||||
|
mapfile -t HARF < <(extract HarfBuzzSharp)
|
||||||
|
|
||||||
|
echo "==> SkiaSharp"
|
||||||
|
printf ' %s\n' "${SKIA[@]}"
|
||||||
|
echo "==> HarfBuzzSharp"
|
||||||
|
printf ' %s\n' "${HARF[@]}"
|
||||||
|
|
||||||
|
log_mixed_versions "SkiaSharp" "${SKIA[@]}"
|
||||||
|
log_mixed_versions "HarfBuzzSharp" "${HARF[@]}"
|
||||||
|
|
||||||
|
mapfile -t SKIA < <(filter_mixed_versions "${SKIA[@]}")
|
||||||
|
mapfile -t HARF < <(filter_mixed_versions "${HARF[@]}")
|
||||||
|
|
||||||
|
NEW_SKIA="$(latest "${SKIA[@]}")"
|
||||||
|
NEW_HARF="$(latest "${HARF[@]}")"
|
||||||
|
|
||||||
|
echo "==> selected"
|
||||||
|
echo " SKIA_VER=$NEW_SKIA"
|
||||||
|
echo " HARFBUZZ_VER=$NEW_HARF"
|
||||||
|
|
||||||
|
any_changed=0
|
||||||
|
changed_files=()
|
||||||
|
|
||||||
|
for file in "${TARGET_FILES[@]}"; do
|
||||||
|
if update_file "$file"; then
|
||||||
|
any_changed=1
|
||||||
|
changed_files+=("$file")
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
if [[ "$any_changed" -eq 0 ]]; then
|
||||||
|
echo "changed=0" >> "$GITHUB_OUTPUT"
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
{
|
||||||
|
echo "changed=1"
|
||||||
|
echo "changed_files<<EOF"
|
||||||
|
printf '%s\n' "${changed_files[@]}"
|
||||||
|
echo "EOF"
|
||||||
|
} >> "$GITHUB_OUTPUT"
|
||||||
|
|
||||||
|
- name: commit
|
||||||
|
if: steps.resolve.outputs.changed == '1'
|
||||||
|
run: |
|
||||||
|
git config user.name github-actions
|
||||||
|
git config user.email github-actions@github.com
|
||||||
|
git add package-rhel-riscv.sh package-debian-riscv.sh
|
||||||
|
if git diff --cached --quiet; then
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
git commit -m "chore: update riscv native dependency versions"
|
||||||
|
git push
|
||||||
@@ -0,0 +1,801 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
VERSION_ARG=""
|
||||||
|
WITH_CORE="both"
|
||||||
|
FORCE_NETCORE=0
|
||||||
|
BUILD_FROM=""
|
||||||
|
XRAY_VER="${XRAY_VER:-}"
|
||||||
|
SING_VER="${SING_VER:-}"
|
||||||
|
|
||||||
|
MIN_KERNEL="5.10"
|
||||||
|
PKGROOT="v2rayN-publish"
|
||||||
|
PROJECT_HINT="v2rayN.Desktop/v2rayN.Desktop.csproj"
|
||||||
|
OUTPUT_DIR="${HOME}/debbuild"
|
||||||
|
DOTNET_TFM="net10.0"
|
||||||
|
DOTNET_RISCV_VERSION="10.0.107"
|
||||||
|
DOTNET_RISCV_BASE="https://github.com/xujiegb/dotnet-riscv/releases/download"
|
||||||
|
DOTNET_RISCV_FILE="dotnet-sdk-${DOTNET_RISCV_VERSION}-linux-riscv64.tar.gz"
|
||||||
|
DOTNET_SDK_URL="${DOTNET_RISCV_BASE}/${DOTNET_RISCV_VERSION}/${DOTNET_RISCV_FILE}"
|
||||||
|
SKIA_VER="${SKIA_VER:-3.119.2}"
|
||||||
|
HARFBUZZ_VER="${HARFBUZZ_VER:-8.3.1.3}"
|
||||||
|
|
||||||
|
OS_ID=""
|
||||||
|
OS_NAME=""
|
||||||
|
OS_VERSION_ID=""
|
||||||
|
HOST_ARCH=""
|
||||||
|
SCRIPT_DIR=""
|
||||||
|
PROJECT=""
|
||||||
|
VERSION=""
|
||||||
|
BUILT_ALL=0
|
||||||
|
|
||||||
|
declare -a BUILT_DEBS=()
|
||||||
|
|
||||||
|
die() {
|
||||||
|
echo "$*" >&2
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
|
||||||
|
parse_args() {
|
||||||
|
local first_arg="${1:-}"
|
||||||
|
|
||||||
|
if [[ -n "$first_arg" && "$first_arg" != --* ]]; then
|
||||||
|
VERSION_ARG="$first_arg"
|
||||||
|
shift || true
|
||||||
|
fi
|
||||||
|
|
||||||
|
while [[ $# -gt 0 ]]; do
|
||||||
|
case "$1" in
|
||||||
|
--with-core) WITH_CORE="${2:-both}"; shift 2 ;;
|
||||||
|
--xray-ver) XRAY_VER="${2:-}"; shift 2 ;;
|
||||||
|
--singbox-ver) SING_VER="${2:-}"; shift 2 ;;
|
||||||
|
--netcore) FORCE_NETCORE=1; shift ;;
|
||||||
|
--buildfrom) BUILD_FROM="${2:-}"; shift 2 ;;
|
||||||
|
*)
|
||||||
|
[[ -n "${VERSION_ARG:-}" ]] || VERSION_ARG="$1"
|
||||||
|
shift
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
|
||||||
|
if [[ -n "${VERSION_ARG:-}" && -n "${BUILD_FROM:-}" ]]; then
|
||||||
|
die "You cannot specify both an explicit version and --buildfrom at the same time.
|
||||||
|
Provide either a version (e.g. 7.14.0) OR --buildfrom 1|2|3."
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
detect_environment() {
|
||||||
|
local current_kernel=""
|
||||||
|
local lowest=""
|
||||||
|
|
||||||
|
. /etc/os-release
|
||||||
|
|
||||||
|
OS_ID="${ID:-}"
|
||||||
|
OS_NAME="${NAME:-$OS_ID}"
|
||||||
|
OS_VERSION_ID="${VERSION_ID:-}"
|
||||||
|
HOST_ARCH="$(uname -m)"
|
||||||
|
|
||||||
|
case "$OS_ID" in
|
||||||
|
debian)
|
||||||
|
echo "Detected supported system: ${OS_NAME:-$OS_ID} ${OS_VERSION_ID:-}"
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
die "Unsupported system: ${OS_NAME:-unknown} (${OS_ID:-unknown}).
|
||||||
|
This script only supports: Debian."
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
case "$HOST_ARCH" in
|
||||||
|
riscv64) ;;
|
||||||
|
*) die "Only supports riscv64" ;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
current_kernel="$(uname -r)"
|
||||||
|
lowest="$(printf '%s\n%s\n' "$MIN_KERNEL" "$current_kernel" | sort -V | head -n1)"
|
||||||
|
|
||||||
|
[[ "$lowest" == "$MIN_KERNEL" ]] || die "Kernel $current_kernel is below $MIN_KERNEL"
|
||||||
|
echo "[OK] Kernel $current_kernel verified."
|
||||||
|
}
|
||||||
|
|
||||||
|
install_dependencies() {
|
||||||
|
local install_ok=0
|
||||||
|
local tmp_dotnet=""
|
||||||
|
|
||||||
|
mkdir -p "$OUTPUT_DIR"
|
||||||
|
|
||||||
|
if command -v apt-get >/dev/null 2>&1; then
|
||||||
|
sudo apt-get update
|
||||||
|
sudo apt-get -y install \
|
||||||
|
curl unzip tar jq rsync ca-certificates git dpkg-dev fakeroot file \
|
||||||
|
desktop-file-utils xdg-utils wget gcc make pkg-config \
|
||||||
|
libicu-dev libssl-dev libfontconfig1 libfreetype6 zlib1g
|
||||||
|
|
||||||
|
mkdir -p "$HOME/.dotnet"
|
||||||
|
tmp_dotnet="$(mktemp -d)"
|
||||||
|
curl -fL "$DOTNET_SDK_URL" -o "$tmp_dotnet/$DOTNET_RISCV_FILE"
|
||||||
|
tar -C "$HOME/.dotnet" -xzf "$tmp_dotnet/$DOTNET_RISCV_FILE"
|
||||||
|
rm -rf "$tmp_dotnet"
|
||||||
|
|
||||||
|
export PATH="$HOME/.dotnet:$PATH"
|
||||||
|
export DOTNET_ROOT="$HOME/.dotnet"
|
||||||
|
|
||||||
|
dotnet --info >/dev/null 2>&1 && install_ok=1
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ "$install_ok" -ne 1 ]]; then
|
||||||
|
echo "Could not auto-install dependencies for '$OS_ID'. Make sure these are available:"
|
||||||
|
echo "dotnet-riscv SDK, curl, unzip, tar, rsync, git, gcc, make, dpkg-deb, fakeroot, libicu-dev, libssl-dev"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
prepare_workspace() {
|
||||||
|
SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)"
|
||||||
|
cd "$SCRIPT_DIR"
|
||||||
|
|
||||||
|
if [[ -f .gitmodules ]]; then
|
||||||
|
git submodule sync --recursive || true
|
||||||
|
git submodule update --init --recursive || true
|
||||||
|
fi
|
||||||
|
|
||||||
|
PROJECT="$PROJECT_HINT"
|
||||||
|
[[ -f "$PROJECT" ]] || PROJECT="$(find . -maxdepth 3 -name 'v2rayN.Desktop.csproj' | head -n1 || true)"
|
||||||
|
[[ -f "$PROJECT" ]] || die "v2rayN.Desktop.csproj not found"
|
||||||
|
}
|
||||||
|
|
||||||
|
choose_channel() {
|
||||||
|
local ch="latest"
|
||||||
|
local sel=""
|
||||||
|
|
||||||
|
if [[ -n "${BUILD_FROM:-}" ]]; then
|
||||||
|
case "$BUILD_FROM" in
|
||||||
|
1) echo "latest"; return 0 ;;
|
||||||
|
2) echo "prerelease"; return 0 ;;
|
||||||
|
3) echo "keep"; return 0 ;;
|
||||||
|
*) die "[ERROR] Invalid --buildfrom value: ${BUILD_FROM}. Use 1|2|3." ;;
|
||||||
|
esac
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ -t 0 ]]; then
|
||||||
|
echo "[?] Choose v2rayN release channel:" >&2
|
||||||
|
echo " 1) Latest (stable) [default]" >&2
|
||||||
|
echo " 2) Pre-release (preview)" >&2
|
||||||
|
echo " 3) Keep current (do nothing)" >&2
|
||||||
|
printf "Enter 1, 2 or 3 [default 1]: " >&2
|
||||||
|
|
||||||
|
if read -r sel </dev/tty; then
|
||||||
|
case "${sel:-}" in
|
||||||
|
2) ch="prerelease" ;;
|
||||||
|
3) ch="keep" ;;
|
||||||
|
esac
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "$ch"
|
||||||
|
}
|
||||||
|
|
||||||
|
get_latest_tag_latest() {
|
||||||
|
curl -fsSL "https://api.github.com/repos/2dust/v2rayN/releases/latest" \
|
||||||
|
| jq -re '.tag_name' \
|
||||||
|
| sed 's/^v//'
|
||||||
|
}
|
||||||
|
|
||||||
|
get_latest_tag_prerelease() {
|
||||||
|
curl -fsSL "https://api.github.com/repos/2dust/v2rayN/releases?per_page=20" \
|
||||||
|
| jq -re 'first(.[] | select(.prerelease == true) | .tag_name)' \
|
||||||
|
| sed 's/^v//'
|
||||||
|
}
|
||||||
|
|
||||||
|
sync_submodules() {
|
||||||
|
if [[ -f .gitmodules ]]; then
|
||||||
|
git submodule sync --recursive || true
|
||||||
|
git submodule update --init --recursive || true
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
git_try_checkout() {
|
||||||
|
local want="$1"
|
||||||
|
local ref=""
|
||||||
|
|
||||||
|
if git rev-parse --git-dir >/dev/null 2>&1; then
|
||||||
|
git fetch --tags --force --prune --depth=1 || true
|
||||||
|
git rev-parse "refs/tags/${want}" >/dev/null 2>&1 && ref="$want"
|
||||||
|
|
||||||
|
if [[ -n "$ref" ]]; then
|
||||||
|
echo "[OK] Found ref '${ref}', checking out..."
|
||||||
|
git checkout -f "$ref"
|
||||||
|
sync_submodules
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
|
||||||
|
apply_channel_or_keep() {
|
||||||
|
local ch="$1"
|
||||||
|
local tag=""
|
||||||
|
|
||||||
|
if [[ "$ch" == "keep" ]]; then
|
||||||
|
echo "[*] Keep current repository state (no checkout)."
|
||||||
|
VERSION="$(git describe --tags --abbrev=0 2>/dev/null || echo '0.0.0+git')"
|
||||||
|
VERSION="${VERSION#v}"
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "[*] Resolving ${ch} tag from GitHub releases..."
|
||||||
|
|
||||||
|
case "$ch" in
|
||||||
|
latest) tag="$(get_latest_tag_latest || true)" ;;
|
||||||
|
prerelease) tag="$(get_latest_tag_prerelease || true)" ;;
|
||||||
|
*) die "Failed to resolve latest tag for channel '${ch}'." ;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
[[ -n "$tag" ]] || die "Failed to resolve latest tag for channel '${ch}'."
|
||||||
|
|
||||||
|
echo "[*] Latest tag for '${ch}': ${tag}"
|
||||||
|
git_try_checkout "$tag" || die "Failed to checkout '${tag}'."
|
||||||
|
VERSION="${tag#v}"
|
||||||
|
}
|
||||||
|
|
||||||
|
resolve_version() {
|
||||||
|
if git rev-parse --git-dir >/dev/null 2>&1; then
|
||||||
|
if [[ -n "${VERSION_ARG:-}" ]]; then
|
||||||
|
local clean_ver="${VERSION_ARG#v}"
|
||||||
|
|
||||||
|
if git_try_checkout "$clean_ver"; then
|
||||||
|
VERSION="$clean_ver"
|
||||||
|
else
|
||||||
|
echo "[WARN] Tag '${VERSION_ARG}' not found."
|
||||||
|
apply_channel_or_keep "$(choose_channel)"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
apply_channel_or_keep "$(choose_channel)"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
echo "Current directory is not a git repo; proceeding on current tree."
|
||||||
|
VERSION="${VERSION_ARG:-0.0.0}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
VERSION="${VERSION#v}"
|
||||||
|
echo "[*] GUI version resolved as: ${VERSION}"
|
||||||
|
}
|
||||||
|
|
||||||
|
apply_riscv_patch() {
|
||||||
|
local f=""
|
||||||
|
|
||||||
|
find . -type f \( -name "*.csproj" -o -name "*.props" -o -name "*.targets" \) \
|
||||||
|
-exec sed -Ei 's#<TargetFramework>[^<]+</TargetFramework>#<TargetFramework>'"$DOTNET_TFM"'</TargetFramework>#g' {} +
|
||||||
|
|
||||||
|
while IFS= read -r -d '' f; do
|
||||||
|
sed -i \
|
||||||
|
-e "s#<PackageVersion Include=\"SkiaSharp\" Version=\"[^\"]*\" */>#<PackageVersion Include=\"SkiaSharp\" Version=\"$SKIA_VER\" />#g" \
|
||||||
|
-e "s#<PackageVersion Include=\"SkiaSharp.NativeAssets.Linux\" Version=\"[^\"]*\" */>#<PackageVersion Include=\"SkiaSharp.NativeAssets.Linux\" Version=\"$SKIA_VER\" />#g" \
|
||||||
|
-e "s#<PackageVersion Include=\"HarfBuzzSharp\" Version=\"[^\"]*\" */>#<PackageVersion Include=\"HarfBuzzSharp\" Version=\"$HARFBUZZ_VER\" />#g" \
|
||||||
|
-e "s#<PackageVersion Include=\"HarfBuzzSharp.NativeAssets.Linux\" Version=\"[^\"]*\" */>#<PackageVersion Include=\"HarfBuzzSharp.NativeAssets.Linux\" Version=\"$HARFBUZZ_VER\" />#g" \
|
||||||
|
"$f"
|
||||||
|
|
||||||
|
grep -q 'PackageVersion Include="SkiaSharp"' "$f" || \
|
||||||
|
sed -i "/<\/ItemGroup>/i\ <PackageVersion Include=\"SkiaSharp\" Version=\"$SKIA_VER\" />" "$f"
|
||||||
|
|
||||||
|
grep -q 'PackageVersion Include="SkiaSharp.NativeAssets.Linux"' "$f" || \
|
||||||
|
sed -i "/<\/ItemGroup>/i\ <PackageVersion Include=\"SkiaSharp.NativeAssets.Linux\" Version=\"$SKIA_VER\" />" "$f"
|
||||||
|
|
||||||
|
grep -q 'PackageVersion Include="HarfBuzzSharp"' "$f" || \
|
||||||
|
sed -i "/<\/ItemGroup>/i\ <PackageVersion Include=\"HarfBuzzSharp\" Version=\"$HARFBUZZ_VER\" />" "$f"
|
||||||
|
|
||||||
|
grep -q 'PackageVersion Include="HarfBuzzSharp.NativeAssets.Linux"' "$f" || \
|
||||||
|
sed -i "/<\/ItemGroup>/i\ <PackageVersion Include=\"HarfBuzzSharp.NativeAssets.Linux\" Version=\"$HARFBUZZ_VER\" />" "$f"
|
||||||
|
done < <(find . -type f -name 'Directory.Packages.props' -print0)
|
||||||
|
|
||||||
|
f="$(find "$DOTNET_ROOT/sdk/$(dotnet --version)" -type f -name 'Microsoft.NETCoreSdk.BundledVersions.props' | head -n1 || true)"
|
||||||
|
if [[ -f "$f" ]] && ! grep -q 'linux-riscv64' "$f"; then
|
||||||
|
sed -i \
|
||||||
|
-e 's/linux-arm64/&;linux-riscv64/g' \
|
||||||
|
-e 's/linux-musl-arm64/&;linux-musl-riscv64/g' \
|
||||||
|
"$f"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
copy_skiasharp_native_riscv64() {
|
||||||
|
local outdir="$1"
|
||||||
|
local skia_so=""
|
||||||
|
local harfbuzz_so=""
|
||||||
|
|
||||||
|
mkdir -p "$outdir"
|
||||||
|
|
||||||
|
skia_so="$(find "$HOME/.nuget/packages" -path "*/skiasharp.nativeassets.linux/${SKIA_VER}/runtimes/linux-riscv64/native/libSkiaSharp.so" | head -n1 || true)"
|
||||||
|
[[ -n "$skia_so" ]] || skia_so="$(find "$HOME/.nuget/packages" -path "*/runtimes/linux-riscv64/native/libSkiaSharp.so" | head -n1 || true)"
|
||||||
|
|
||||||
|
harfbuzz_so="$(find "$HOME/.nuget/packages" -path "*/harfbuzzsharp.nativeassets.linux/${HARFBUZZ_VER}/runtimes/linux-riscv64/native/libHarfBuzzSharp.so" | head -n1 || true)"
|
||||||
|
[[ -n "$harfbuzz_so" ]] || harfbuzz_so="$(find "$HOME/.nuget/packages" -path "*/runtimes/linux-riscv64/native/libHarfBuzzSharp.so" | head -n1 || true)"
|
||||||
|
|
||||||
|
if [[ -n "$skia_so" && -f "$skia_so" ]]; then
|
||||||
|
echo "[+] Copy libSkiaSharp.so from NuGet cache"
|
||||||
|
install -m 755 "$skia_so" "$outdir/libSkiaSharp.so"
|
||||||
|
else
|
||||||
|
echo "[WARN] libSkiaSharp.so for linux-riscv64 not found in NuGet cache"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ -n "$harfbuzz_so" && -f "$harfbuzz_so" ]]; then
|
||||||
|
echo "[+] Copy libHarfBuzzSharp.so from NuGet cache"
|
||||||
|
install -m 755 "$harfbuzz_so" "$outdir/libHarfBuzzSharp.so"
|
||||||
|
else
|
||||||
|
echo "[WARN] libHarfBuzzSharp.so for linux-riscv64 not found in NuGet cache"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
xray_url_for_rid() {
|
||||||
|
local rid="$1"
|
||||||
|
local ver="$2"
|
||||||
|
|
||||||
|
case "$rid" in
|
||||||
|
linux-riscv64) echo "https://github.com/XTLS/Xray-core/releases/download/v${ver}/Xray-linux-riscv64.zip" ;;
|
||||||
|
*) return 1 ;;
|
||||||
|
esac
|
||||||
|
}
|
||||||
|
|
||||||
|
singbox_url_for_rid() {
|
||||||
|
local rid="$1"
|
||||||
|
local ver="$2"
|
||||||
|
|
||||||
|
case "$rid" in
|
||||||
|
linux-riscv64) echo "https://github.com/SagerNet/sing-box/releases/download/v${ver}/sing-box-${ver}-linux-riscv64.tar.gz" ;;
|
||||||
|
*) return 1 ;;
|
||||||
|
esac
|
||||||
|
}
|
||||||
|
|
||||||
|
bundle_url_for_rid() {
|
||||||
|
local rid="$1"
|
||||||
|
|
||||||
|
case "$rid" in
|
||||||
|
linux-riscv64) echo "https://raw.githubusercontent.com/2dust/v2rayN-core-bin/refs/heads/master/v2rayN-linux-riscv64.zip" ;;
|
||||||
|
*) return 1 ;;
|
||||||
|
esac
|
||||||
|
}
|
||||||
|
|
||||||
|
download_xray() {
|
||||||
|
local outdir="$1"
|
||||||
|
local rid="$2"
|
||||||
|
local ver="${XRAY_VER:-}"
|
||||||
|
local url=""
|
||||||
|
local tmp=""
|
||||||
|
|
||||||
|
mkdir -p "$outdir"
|
||||||
|
|
||||||
|
if [[ -z "$ver" ]]; then
|
||||||
|
ver="$(curl -fsSL https://api.github.com/repos/XTLS/Xray-core/releases/latest \
|
||||||
|
| grep -Eo '"tag_name":\s*"v[^"]+"' \
|
||||||
|
| sed -E 's/.*"v([^"]+)".*/\1/' \
|
||||||
|
| head -n1)" || true
|
||||||
|
fi
|
||||||
|
|
||||||
|
[[ -n "$ver" ]] || { echo "[xray] Failed to get version"; return 1; }
|
||||||
|
url="$(xray_url_for_rid "$rid" "$ver")" || { echo "[xray] Unsupported RID: $rid"; return 1; }
|
||||||
|
|
||||||
|
echo "[+] Download xray: $url"
|
||||||
|
|
||||||
|
tmp="$(mktemp -d)"
|
||||||
|
curl -fL "$url" -o "$tmp/xray.zip" || { rm -rf "$tmp"; return 1; }
|
||||||
|
unzip -q "$tmp/xray.zip" -d "$tmp" || { rm -rf "$tmp"; return 1; }
|
||||||
|
install -m 755 "$tmp/xray" "$outdir/xray" || { rm -rf "$tmp"; return 1; }
|
||||||
|
rm -rf "$tmp"
|
||||||
|
}
|
||||||
|
|
||||||
|
download_singbox() {
|
||||||
|
local outdir="$1"
|
||||||
|
local rid="$2"
|
||||||
|
local ver="${SING_VER:-}"
|
||||||
|
local url=""
|
||||||
|
local tmp=""
|
||||||
|
local bin=""
|
||||||
|
local cronet=""
|
||||||
|
|
||||||
|
mkdir -p "$outdir"
|
||||||
|
|
||||||
|
if [[ -z "$ver" ]]; then
|
||||||
|
ver="$(curl -fsSL https://api.github.com/repos/SagerNet/sing-box/releases/latest \
|
||||||
|
| grep -Eo '"tag_name":\s*"v[^"]+"' \
|
||||||
|
| sed -E 's/.*"v([^"]+)".*/\1/' \
|
||||||
|
| head -n1)" || true
|
||||||
|
fi
|
||||||
|
|
||||||
|
[[ -n "$ver" ]] || { echo "[sing-box] Failed to get version"; return 1; }
|
||||||
|
url="$(singbox_url_for_rid "$rid" "$ver")" || { echo "[sing-box] Unsupported RID: $rid"; return 1; }
|
||||||
|
|
||||||
|
echo "[+] Download sing-box: $url"
|
||||||
|
|
||||||
|
tmp="$(mktemp -d)"
|
||||||
|
curl -fL "$url" -o "$tmp/singbox.tar.gz" || { rm -rf "$tmp"; return 1; }
|
||||||
|
tar -C "$tmp" -xzf "$tmp/singbox.tar.gz" || { rm -rf "$tmp"; return 1; }
|
||||||
|
|
||||||
|
bin="$(find "$tmp" -type f -name 'sing-box' | head -n1 || true)"
|
||||||
|
[[ -n "$bin" ]] || { echo "[!] sing-box unpack failed"; rm -rf "$tmp"; return 1; }
|
||||||
|
|
||||||
|
install -m 755 "$bin" "$outdir/sing-box" || { rm -rf "$tmp"; return 1; }
|
||||||
|
|
||||||
|
cronet="$(find "$tmp" -type f -name 'libcronet*.so*' | head -n1 || true)"
|
||||||
|
[[ -n "$cronet" ]] && install -m 644 "$cronet" "$outdir/libcronet.so" || true
|
||||||
|
|
||||||
|
rm -rf "$tmp"
|
||||||
|
}
|
||||||
|
|
||||||
|
unify_geo_layout() {
|
||||||
|
local outroot="$1"
|
||||||
|
local n
|
||||||
|
local names=(
|
||||||
|
geosite.dat
|
||||||
|
geoip.dat
|
||||||
|
geoip-only-cn-private.dat
|
||||||
|
Country.mmdb
|
||||||
|
geoip.metadb
|
||||||
|
)
|
||||||
|
|
||||||
|
mkdir -p "$outroot/bin"
|
||||||
|
|
||||||
|
for n in "${names[@]}"; do
|
||||||
|
if [[ -f "$outroot/bin/xray/$n" ]]; then
|
||||||
|
mv -f "$outroot/bin/xray/$n" "$outroot/bin/$n"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
|
download_geo_assets() {
|
||||||
|
local outroot="$1"
|
||||||
|
local bin_dir="$outroot/bin"
|
||||||
|
local srss_dir="$bin_dir/srss"
|
||||||
|
local f=""
|
||||||
|
|
||||||
|
mkdir -p "$bin_dir" "$srss_dir"
|
||||||
|
|
||||||
|
echo "[+] Download Xray Geo to ${bin_dir}"
|
||||||
|
curl -fsSL -o "$bin_dir/geosite.dat" "https://github.com/Loyalsoldier/V2ray-rules-dat/releases/latest/download/geosite.dat"
|
||||||
|
curl -fsSL -o "$bin_dir/geoip.dat" "https://github.com/Loyalsoldier/V2ray-rules-dat/releases/latest/download/geoip.dat"
|
||||||
|
curl -fsSL -o "$bin_dir/geoip-only-cn-private.dat" "https://raw.githubusercontent.com/Loyalsoldier/geoip/release/geoip-only-cn-private.dat"
|
||||||
|
curl -fsSL -o "$bin_dir/Country.mmdb" "https://raw.githubusercontent.com/Loyalsoldier/geoip/release/Country.mmdb"
|
||||||
|
|
||||||
|
echo "[+] Download sing-box rule DB & rule-sets"
|
||||||
|
curl -fsSL -o "$bin_dir/geoip.metadb" "https://github.com/MetaCubeX/meta-rules-dat/releases/latest/download/geoip.metadb"
|
||||||
|
|
||||||
|
for f in geoip-private.srs geoip-cn.srs geoip-facebook.srs geoip-fastly.srs geoip-google.srs geoip-netflix.srs geoip-telegram.srs geoip-twitter.srs; do
|
||||||
|
curl -fsSL -o "$srss_dir/$f" "https://raw.githubusercontent.com/2dust/sing-box-rules/refs/heads/rule-set-geoip/$f"
|
||||||
|
done
|
||||||
|
|
||||||
|
for f in geosite-cn.srs geosite-gfw.srs geosite-google.srs geosite-greatfire.srs geosite-geolocation-cn.srs geosite-category-ads-all.srs geosite-private.srs; do
|
||||||
|
curl -fsSL -o "$srss_dir/$f" "https://raw.githubusercontent.com/2dust/sing-box-rules/refs/heads/rule-set-geosite/$f"
|
||||||
|
done
|
||||||
|
|
||||||
|
unify_geo_layout "$outroot"
|
||||||
|
}
|
||||||
|
|
||||||
|
populate_assets_zip_mode() {
|
||||||
|
local outroot="$1"
|
||||||
|
local rid="$2"
|
||||||
|
local url=""
|
||||||
|
local tmp=""
|
||||||
|
local nested_dir=""
|
||||||
|
|
||||||
|
url="$(bundle_url_for_rid "$rid")" || { echo "[!] Bundle unsupported RID: $rid"; return 1; }
|
||||||
|
|
||||||
|
echo "[+] Try v2rayN bundle archive: $url"
|
||||||
|
|
||||||
|
tmp="$(mktemp -d)"
|
||||||
|
curl -fL "$url" -o "$tmp/v2rayn.zip" || { echo "[!] Bundle download failed"; rm -rf "$tmp"; return 1; }
|
||||||
|
unzip -q "$tmp/v2rayn.zip" -d "$tmp" || { echo "[!] Bundle unzip failed"; rm -rf "$tmp"; return 1; }
|
||||||
|
|
||||||
|
if [[ -d "$tmp/bin" ]]; then
|
||||||
|
mkdir -p "$outroot/bin"
|
||||||
|
rsync -a "$tmp/bin/" "$outroot/bin/"
|
||||||
|
else
|
||||||
|
rsync -a "$tmp/" "$outroot/"
|
||||||
|
fi
|
||||||
|
|
||||||
|
rm -f "$outroot/v2rayn.zip" 2>/dev/null || true
|
||||||
|
find "$outroot" -type d -name "mihomo" -prune -exec rm -rf {} + 2>/dev/null || true
|
||||||
|
|
||||||
|
nested_dir="$(find "$outroot" -maxdepth 1 -type d -name 'v2rayN-linux-*' | head -n1 || true)"
|
||||||
|
if [[ -n "$nested_dir" && -d "$nested_dir/bin" ]]; then
|
||||||
|
mkdir -p "$outroot/bin"
|
||||||
|
rsync -a "$nested_dir/bin/" "$outroot/bin/"
|
||||||
|
rm -rf "$nested_dir"
|
||||||
|
fi
|
||||||
|
|
||||||
|
unify_geo_layout "$outroot"
|
||||||
|
rm -rf "$tmp"
|
||||||
|
|
||||||
|
echo "[+] Bundle extracted to $outroot"
|
||||||
|
}
|
||||||
|
|
||||||
|
populate_assets_netcore_mode() {
|
||||||
|
local outroot="$1"
|
||||||
|
local rid="$2"
|
||||||
|
|
||||||
|
mkdir -p "$outroot/bin/xray" "$outroot/bin/sing_box"
|
||||||
|
|
||||||
|
if [[ "$WITH_CORE" == "xray" || "$WITH_CORE" == "both" ]]; then
|
||||||
|
download_xray "$outroot/bin/xray" "$rid" || echo "[!] xray download failed (skipped)"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ "$WITH_CORE" == "sing-box" || "$WITH_CORE" == "both" ]]; then
|
||||||
|
download_singbox "$outroot/bin/sing_box" "$rid" || echo "[!] sing-box download failed (skipped)"
|
||||||
|
fi
|
||||||
|
|
||||||
|
download_geo_assets "$outroot" || echo "[!] Geo rules download failed (skipped)"
|
||||||
|
}
|
||||||
|
|
||||||
|
stage_runtime_assets() {
|
||||||
|
local outroot="$1"
|
||||||
|
local rid="$2"
|
||||||
|
|
||||||
|
mkdir -p "$outroot/bin/xray" "$outroot/bin/sing_box"
|
||||||
|
|
||||||
|
if [[ "$FORCE_NETCORE" -eq 0 ]]; then
|
||||||
|
if populate_assets_zip_mode "$outroot" "$rid"; then
|
||||||
|
echo "[*] Using v2rayN bundle archive."
|
||||||
|
else
|
||||||
|
echo "[*] Bundle failed, fallback to separate core + rules."
|
||||||
|
populate_assets_netcore_mode "$outroot" "$rid"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
echo "[*] --netcore specified: use separate core + rules."
|
||||||
|
populate_assets_netcore_mode "$outroot" "$rid"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
describe_target() {
|
||||||
|
local short="$1"
|
||||||
|
|
||||||
|
case "$short" in
|
||||||
|
riscv64) printf '%s\n%s\n' "linux-riscv64" "riscv64" ;;
|
||||||
|
*) echo "Unknown arch '$short' (use riscv64)" >&2; return 1 ;;
|
||||||
|
esac
|
||||||
|
}
|
||||||
|
|
||||||
|
publish_binary() {
|
||||||
|
local rid="$1"
|
||||||
|
|
||||||
|
dotnet clean "$PROJECT" -c Release -p:TargetFramework="$DOTNET_TFM"
|
||||||
|
rm -rf "$(dirname "$PROJECT")/bin/Release/${DOTNET_TFM}" || true
|
||||||
|
dotnet restore "$PROJECT" -r "$rid" -p:TargetFramework="$DOTNET_TFM"
|
||||||
|
dotnet publish "$PROJECT" -c Release -r "$rid" -p:TargetFramework="$DOTNET_TFM" -p:PublishSingleFile=false -p:SelfContained=true
|
||||||
|
}
|
||||||
|
|
||||||
|
write_launcher_file() {
|
||||||
|
local stage="$1"
|
||||||
|
|
||||||
|
install -m 755 /dev/stdin "$stage/usr/bin/v2rayn" <<'EOF'
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
set -euo pipefail
|
||||||
|
DIR="/opt/v2rayN"
|
||||||
|
export LD_LIBRARY_PATH="$DIR:${LD_LIBRARY_PATH:-}"
|
||||||
|
cd "$DIR"
|
||||||
|
|
||||||
|
if [[ -x "$DIR/v2rayN" ]]; then
|
||||||
|
exec "$DIR/v2rayN" "$@"
|
||||||
|
fi
|
||||||
|
|
||||||
|
for dll in v2rayN.Desktop.dll v2rayN.dll; do
|
||||||
|
if [[ -f "$DIR/$dll" ]]; then
|
||||||
|
exec /usr/bin/dotnet "$DIR/$dll" "$@"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
echo "v2rayN launcher: no executable found in $DIR" >&2
|
||||||
|
ls -l "$DIR" >&2 || true
|
||||||
|
exit 1
|
||||||
|
EOF
|
||||||
|
}
|
||||||
|
|
||||||
|
write_desktop_file() {
|
||||||
|
local stage="$1"
|
||||||
|
|
||||||
|
install -m 644 /dev/stdin "$stage/usr/share/applications/v2rayn.desktop" <<'EOF'
|
||||||
|
[Desktop Entry]
|
||||||
|
Type=Application
|
||||||
|
Name=v2rayN
|
||||||
|
Comment=v2rayN for Debian GNU Linux
|
||||||
|
Exec=v2rayn
|
||||||
|
Icon=v2rayn
|
||||||
|
Terminal=false
|
||||||
|
Categories=Network;
|
||||||
|
EOF
|
||||||
|
}
|
||||||
|
|
||||||
|
write_maintainer_scripts() {
|
||||||
|
local debian_dir="$1"
|
||||||
|
|
||||||
|
install -m 755 /dev/stdin "$debian_dir/postinst" <<'EOF'
|
||||||
|
#!/bin/sh
|
||||||
|
set -e
|
||||||
|
update-desktop-database /usr/share/applications >/dev/null 2>&1 || true
|
||||||
|
if command -v gtk-update-icon-cache >/dev/null 2>&1; then
|
||||||
|
gtk-update-icon-cache -f /usr/share/icons/hicolor >/dev/null 2>&1 || true
|
||||||
|
fi
|
||||||
|
exit 0
|
||||||
|
EOF
|
||||||
|
|
||||||
|
install -m 755 /dev/stdin "$debian_dir/postrm" <<'EOF'
|
||||||
|
#!/bin/sh
|
||||||
|
set -e
|
||||||
|
update-desktop-database /usr/share/applications >/dev/null 2>&1 || true
|
||||||
|
if command -v gtk-update-icon-cache >/dev/null 2>&1; then
|
||||||
|
gtk-update-icon-cache -f /usr/share/icons/hicolor >/dev/null 2>&1 || true
|
||||||
|
fi
|
||||||
|
exit 0
|
||||||
|
EOF
|
||||||
|
}
|
||||||
|
|
||||||
|
package_binary() {
|
||||||
|
local short="$1"
|
||||||
|
local rid="$2"
|
||||||
|
local deb_arch="$3"
|
||||||
|
local pubdir=""
|
||||||
|
local workdir=""
|
||||||
|
local stage=""
|
||||||
|
local debian_dir=""
|
||||||
|
local project_dir=""
|
||||||
|
local icon_candidate=""
|
||||||
|
local shlibs_depends=""
|
||||||
|
local extra_depends=""
|
||||||
|
local final_depends=""
|
||||||
|
local multiarch=""
|
||||||
|
local sys_libdir=""
|
||||||
|
local sys_usrlibdir=""
|
||||||
|
local deb_out=""
|
||||||
|
|
||||||
|
pubdir="$(dirname "$PROJECT")/bin/Release/${DOTNET_TFM}/${rid}/publish"
|
||||||
|
[[ -d "$pubdir" ]] || { echo "Publish directory not found: $pubdir"; return 1; }
|
||||||
|
|
||||||
|
workdir="$(mktemp -d)"
|
||||||
|
trap '[[ -n "${workdir:-}" ]] && rm -rf "$workdir"' RETURN
|
||||||
|
|
||||||
|
stage="$workdir/${PKGROOT}_${VERSION}_${deb_arch}"
|
||||||
|
debian_dir="$stage/DEBIAN"
|
||||||
|
|
||||||
|
mkdir -p "$stage/opt/v2rayN" "$stage/usr/bin" "$stage/usr/share/applications" "$stage/usr/share/icons/hicolor/256x256/apps" "$debian_dir"
|
||||||
|
cp -a "$pubdir/." "$stage/opt/v2rayN/"
|
||||||
|
|
||||||
|
copy_skiasharp_native_riscv64 "$stage/opt/v2rayN" || echo "[!] SkiaSharp native copy failed (skipped)"
|
||||||
|
|
||||||
|
project_dir="$(cd "$(dirname "$PROJECT")" && pwd)"
|
||||||
|
icon_candidate="$project_dir/v2rayN.png"
|
||||||
|
[[ -f "$icon_candidate" ]] && cp "$icon_candidate" "$stage/usr/share/icons/hicolor/256x256/apps/v2rayn.png" || true
|
||||||
|
|
||||||
|
stage_runtime_assets "$stage/opt/v2rayN" "$rid"
|
||||||
|
write_launcher_file "$stage"
|
||||||
|
write_desktop_file "$stage"
|
||||||
|
write_maintainer_scripts "$debian_dir"
|
||||||
|
|
||||||
|
extra_depends="libc6 (>= 2.34), fontconfig (>= 2.13.1), desktop-file-utils (>= 0.26), xdg-utils (>= 1.1.3), coreutils (>= 8.32), bash (>= 5.1), libfreetype6 (>= 2.11)"
|
||||||
|
|
||||||
|
mkdir -p "$workdir/debian"
|
||||||
|
cat > "$workdir/debian/control" <<EOF
|
||||||
|
Source: v2rayn
|
||||||
|
Section: net
|
||||||
|
Priority: optional
|
||||||
|
Maintainer: 2dust <noreply@github.com>
|
||||||
|
Standards-Version: 4.7.0
|
||||||
|
|
||||||
|
Package: v2rayn
|
||||||
|
Architecture: ${deb_arch}
|
||||||
|
Description: v2rayN
|
||||||
|
EOF
|
||||||
|
|
||||||
|
multiarch="$(dpkg-architecture -a"$deb_arch" -qDEB_HOST_MULTIARCH)"
|
||||||
|
sys_libdir="/lib/$multiarch"
|
||||||
|
sys_usrlibdir="/usr/lib/$multiarch"
|
||||||
|
|
||||||
|
: > "$debian_dir/substvars"
|
||||||
|
|
||||||
|
mapfile -t ELF_FILES < <(
|
||||||
|
find "$stage/opt/v2rayN" -type f \( -name "*.so*" -o -perm -111 \) ! -name 'libcoreclrtraceptprovider.so'
|
||||||
|
)
|
||||||
|
|
||||||
|
if [[ "${#ELF_FILES[@]}" -gt 0 ]]; then
|
||||||
|
(
|
||||||
|
cd "$workdir"
|
||||||
|
dpkg-shlibdeps \
|
||||||
|
-l"$stage/opt/v2rayN" \
|
||||||
|
-l"$sys_libdir" \
|
||||||
|
-l"$sys_usrlibdir" \
|
||||||
|
-T"$debian_dir/substvars" \
|
||||||
|
"${ELF_FILES[@]}"
|
||||||
|
) >/dev/null 2>&1 || true
|
||||||
|
fi
|
||||||
|
|
||||||
|
shlibs_depends="$(sed -n 's/^shlibs:Depends=//p' "$debian_dir/substvars" | head -n1 || true)"
|
||||||
|
|
||||||
|
if [[ -n "$shlibs_depends" ]]; then
|
||||||
|
shlibs_depends="$(echo "$shlibs_depends" \
|
||||||
|
| sed -E 's/ *\([^)]*\)//g' \
|
||||||
|
| sed -E 's/ *, */, /g' \
|
||||||
|
| sed -E 's/^, *//; s/, *$//')"
|
||||||
|
final_depends="${shlibs_depends}, ${extra_depends}"
|
||||||
|
else
|
||||||
|
final_depends="${extra_depends}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
cat > "$debian_dir/control" <<EOF
|
||||||
|
Package: v2rayn
|
||||||
|
Version: ${VERSION}
|
||||||
|
Architecture: ${deb_arch}
|
||||||
|
Maintainer: 2dust <noreply@github.com>
|
||||||
|
Homepage: https://github.com/2dust/v2rayN
|
||||||
|
Section: net
|
||||||
|
Priority: optional
|
||||||
|
Depends: ${final_depends}
|
||||||
|
Description: v2rayN (Avalonia) GUI client for Linux
|
||||||
|
Support vless / vmess / Trojan / http / socks / Anytls / Hysteria2 /
|
||||||
|
Shadowsocks / tuic / WireGuard.
|
||||||
|
EOF
|
||||||
|
|
||||||
|
find "$stage/opt/v2rayN" -type d -exec chmod 0755 {} +
|
||||||
|
find "$stage/opt/v2rayN" -type f -exec chmod 0644 {} +
|
||||||
|
[[ -f "$stage/opt/v2rayN/v2rayN" ]] && chmod 0755 "$stage/opt/v2rayN/v2rayN" || true
|
||||||
|
[[ -f "$stage/opt/v2rayN/libSkiaSharp.so" ]] && chmod 0755 "$stage/opt/v2rayN/libSkiaSharp.so" || true
|
||||||
|
[[ -f "$stage/opt/v2rayN/libHarfBuzzSharp.so" ]] && chmod 0755 "$stage/opt/v2rayN/libHarfBuzzSharp.so" || true
|
||||||
|
|
||||||
|
deb_out="$OUTPUT_DIR/v2rayn_${VERSION}_${deb_arch}.deb"
|
||||||
|
dpkg-deb --root-owner-group --build "$stage" "$deb_out"
|
||||||
|
|
||||||
|
echo "Build done for $short. DEB at:"
|
||||||
|
echo " $deb_out"
|
||||||
|
BUILT_DEBS+=("$deb_out")
|
||||||
|
}
|
||||||
|
|
||||||
|
select_targets() {
|
||||||
|
printf '%s\n' riscv64
|
||||||
|
}
|
||||||
|
|
||||||
|
build_one_target() {
|
||||||
|
local short="$1"
|
||||||
|
local meta=()
|
||||||
|
local rid=""
|
||||||
|
local deb_arch=""
|
||||||
|
|
||||||
|
mapfile -t meta < <(describe_target "$short") || return 1
|
||||||
|
rid="${meta[0]}"
|
||||||
|
deb_arch="${meta[1]}"
|
||||||
|
|
||||||
|
echo "[*] Building for target: $short (RID=$rid, DEB arch=$deb_arch)"
|
||||||
|
publish_binary "$rid"
|
||||||
|
package_binary "$short" "$rid" "$deb_arch"
|
||||||
|
}
|
||||||
|
|
||||||
|
print_summary() {
|
||||||
|
local pkg=""
|
||||||
|
|
||||||
|
echo ""
|
||||||
|
echo "================ Build Summary ================="
|
||||||
|
if [[ "${#BUILT_DEBS[@]}" -gt 0 ]]; then
|
||||||
|
echo "Output directory: $OUTPUT_DIR"
|
||||||
|
for pkg in "${BUILT_DEBS[@]}"; do
|
||||||
|
echo "$pkg"
|
||||||
|
done
|
||||||
|
else
|
||||||
|
echo "No DEBs detected in summary (check build logs above)."
|
||||||
|
fi
|
||||||
|
echo "==============================================="
|
||||||
|
}
|
||||||
|
|
||||||
|
main() {
|
||||||
|
local targets=()
|
||||||
|
local arch=""
|
||||||
|
|
||||||
|
parse_args "$@"
|
||||||
|
detect_environment
|
||||||
|
install_dependencies
|
||||||
|
prepare_workspace
|
||||||
|
resolve_version
|
||||||
|
apply_riscv_patch
|
||||||
|
|
||||||
|
mapfile -t targets < <(select_targets)
|
||||||
|
|
||||||
|
for arch in "${targets[@]}"; do
|
||||||
|
build_one_target "$arch"
|
||||||
|
done
|
||||||
|
|
||||||
|
print_summary
|
||||||
|
}
|
||||||
|
|
||||||
|
main "$@"
|
||||||
+498
-354
File diff suppressed because it is too large
Load Diff
+471
-405
File diff suppressed because it is too large
Load Diff
+428
-317
@@ -1,115 +1,138 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
|
||||||
# Require Red Hat base branch
|
VERSION_ARG=""
|
||||||
. /etc/os-release
|
WITH_CORE="both"
|
||||||
|
FORCE_NETCORE=0
|
||||||
|
ARCH_OVERRIDE=""
|
||||||
|
BUILD_FROM=""
|
||||||
|
XRAY_VER="${XRAY_VER:-}"
|
||||||
|
SING_VER="${SING_VER:-}"
|
||||||
|
|
||||||
case "${ID:-}" in
|
MIN_KERNEL="6.12"
|
||||||
rhel|rocky|almalinux|fedora|centos)
|
PKGROOT="v2rayN-publish"
|
||||||
echo "Detected supported system: ${NAME:-$ID} ${VERSION_ID:-}"
|
PROJECT_HINT="v2rayN.Desktop/v2rayN.Desktop.csproj"
|
||||||
;;
|
RPM_TOPDIR="${HOME}/rpmbuild"
|
||||||
*)
|
|
||||||
echo "Unsupported system: ${NAME:-unknown} (${ID:-unknown})."
|
|
||||||
echo "This script only supports: RHEL / Rocky / AlmaLinux / Fedora / CentOS."
|
|
||||||
exit 1
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
# Kernel version
|
OS_ID=""
|
||||||
MIN_KERNEL="6.11"
|
OS_NAME=""
|
||||||
CURRENT_KERNEL="$(uname -r)"
|
OS_VERSION_ID=""
|
||||||
|
HOST_ARCH=""
|
||||||
|
SCRIPT_DIR=""
|
||||||
|
PROJECT=""
|
||||||
|
VERSION=""
|
||||||
|
BUILT_ALL=0
|
||||||
|
|
||||||
lowest="$(printf '%s\n%s\n' "$MIN_KERNEL" "$CURRENT_KERNEL" | sort -V | head -n1)"
|
declare -a BUILT_RPMS=()
|
||||||
|
|
||||||
if [[ "$lowest" != "$MIN_KERNEL" ]]; then
|
die() {
|
||||||
echo "Kernel $CURRENT_KERNEL is below $MIN_KERNEL"
|
echo "$*" >&2
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "[OK] Kernel $CURRENT_KERNEL verified."
|
|
||||||
|
|
||||||
# Config & Parse arguments
|
|
||||||
VERSION_ARG="${1:-}" # Pass version number like 7.13.8, or leave empty
|
|
||||||
WITH_CORE="both" # Default: bundle both xray+sing-box
|
|
||||||
FORCE_NETCORE=0 # --netcore => skip archive bundle, use separate downloads
|
|
||||||
ARCH_OVERRIDE="" # --arch x64|arm64|all (optional compile target)
|
|
||||||
BUILD_FROM="" # --buildfrom 1|2|3 to select channel non-interactively
|
|
||||||
|
|
||||||
# If the first argument starts with --, do not treat it as a version number
|
|
||||||
if [[ "${VERSION_ARG:-}" == --* ]]; then
|
|
||||||
VERSION_ARG=""
|
|
||||||
fi
|
|
||||||
# Take the first non --* argument as version, discard it
|
|
||||||
if [[ -n "${VERSION_ARG:-}" ]]; then shift || true; fi
|
|
||||||
|
|
||||||
# Parse remaining optional arguments
|
|
||||||
while [[ $# -gt 0 ]]; do
|
|
||||||
case "$1" in
|
|
||||||
--with-core) WITH_CORE="${2:-both}"; shift 2;;
|
|
||||||
--xray-ver) XRAY_VER="${2:-}"; shift 2;;
|
|
||||||
--singbox-ver) SING_VER="${2:-}"; shift 2;;
|
|
||||||
--netcore) FORCE_NETCORE=1; shift;;
|
|
||||||
--arch) ARCH_OVERRIDE="${2:-}"; shift 2;;
|
|
||||||
--buildfrom) BUILD_FROM="${2:-}"; shift 2;;
|
|
||||||
*)
|
|
||||||
if [[ -z "${VERSION_ARG:-}" ]]; then VERSION_ARG="$1"; fi
|
|
||||||
shift;;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
|
|
||||||
# Conflict: version number AND --buildfrom cannot be used together
|
|
||||||
if [[ -n "${VERSION_ARG:-}" && -n "${BUILD_FROM:-}" ]]; then
|
|
||||||
echo "You cannot specify both an explicit version and --buildfrom at the same time."
|
|
||||||
echo " Provide either a version (e.g. 7.14.0) OR --buildfrom 1|2|3."
|
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
}
|
||||||
|
|
||||||
# Check and install dependencies
|
parse_args() {
|
||||||
host_arch="$(uname -m)"
|
local first_arg="${1:-}"
|
||||||
[[ "$host_arch" == "aarch64" || "$host_arch" == "x86_64" ]] || { echo "Only supports aarch64 / x86_64"; exit 1; }
|
|
||||||
|
|
||||||
install_ok=0
|
if [[ -n "$first_arg" && "$first_arg" != --* ]]; then
|
||||||
|
VERSION_ARG="$first_arg"
|
||||||
if command -v dnf >/dev/null 2>&1; then
|
shift || true
|
||||||
sudo dnf -y install rpm-build rpmdevtools curl unzip tar jq rsync dotnet-sdk-10.0 \
|
|
||||||
&& install_ok=1
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ "$install_ok" -ne 1 ]]; then
|
|
||||||
echo "Could not auto-install dependencies for '$ID'. Make sure these are available:"
|
|
||||||
echo "dotnet-sdk 10.x, curl, unzip, tar, rsync, rpm, rpmdevtools, rpm-build (on Red Hat branch)"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Root directory
|
|
||||||
SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)"
|
|
||||||
cd "$SCRIPT_DIR"
|
|
||||||
|
|
||||||
# Git submodules (best effort)
|
|
||||||
if [[ -f .gitmodules ]]; then
|
|
||||||
git submodule sync --recursive || true
|
|
||||||
git submodule update --init --recursive || true
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Locate project
|
|
||||||
PROJECT="v2rayN.Desktop/v2rayN.Desktop.csproj"
|
|
||||||
if [[ ! -f "$PROJECT" ]]; then
|
|
||||||
PROJECT="$(find . -maxdepth 3 -name 'v2rayN.Desktop.csproj' | head -n1 || true)"
|
|
||||||
fi
|
|
||||||
[[ -f "$PROJECT" ]] || { echo "v2rayN.Desktop.csproj not found"; exit 1; }
|
|
||||||
|
|
||||||
choose_channel() {
|
|
||||||
# If --buildfrom provided, map it directly and skip interaction.
|
|
||||||
if [[ -n "${BUILD_FROM:-}" ]]; then
|
|
||||||
case "$BUILD_FROM" in
|
|
||||||
1) echo "latest"; return 0;;
|
|
||||||
2) echo "prerelease"; return 0;;
|
|
||||||
3) echo "keep"; return 0;;
|
|
||||||
*) echo "[ERROR] Invalid --buildfrom value: ${BUILD_FROM}. Use 1|2|3." >&2; exit 1;;
|
|
||||||
esac
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Print menu to stderr and read from /dev/tty so stdout only carries the token.
|
while [[ $# -gt 0 ]]; do
|
||||||
local ch="latest" sel=""
|
case "$1" in
|
||||||
|
--with-core) WITH_CORE="${2:-both}"; shift 2 ;;
|
||||||
|
--xray-ver) XRAY_VER="${2:-}"; shift 2 ;;
|
||||||
|
--singbox-ver) SING_VER="${2:-}"; shift 2 ;;
|
||||||
|
--netcore) FORCE_NETCORE=1; shift ;;
|
||||||
|
--arch) ARCH_OVERRIDE="${2:-}"; shift 2 ;;
|
||||||
|
--buildfrom) BUILD_FROM="${2:-}"; shift 2 ;;
|
||||||
|
*)
|
||||||
|
[[ -n "${VERSION_ARG:-}" ]] || VERSION_ARG="$1"
|
||||||
|
shift
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
|
||||||
|
if [[ -n "${VERSION_ARG:-}" && -n "${BUILD_FROM:-}" ]]; then
|
||||||
|
die "You cannot specify both an explicit version and --buildfrom at the same time.
|
||||||
|
Provide either a version (e.g. 7.14.0) OR --buildfrom 1|2|3."
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
detect_environment() {
|
||||||
|
local current_kernel=""
|
||||||
|
local lowest=""
|
||||||
|
|
||||||
|
. /etc/os-release
|
||||||
|
|
||||||
|
OS_ID="${ID:-}"
|
||||||
|
OS_NAME="${NAME:-$OS_ID}"
|
||||||
|
OS_VERSION_ID="${VERSION_ID:-}"
|
||||||
|
HOST_ARCH="$(uname -m)"
|
||||||
|
|
||||||
|
case "$OS_ID" in
|
||||||
|
rhel|rocky|almalinux|fedora|centos)
|
||||||
|
echo "Detected supported system: ${OS_NAME:-$OS_ID} ${OS_VERSION_ID:-}"
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
die "Unsupported system: ${OS_NAME:-unknown} (${OS_ID:-unknown}).
|
||||||
|
This script only supports: RHEL / Rocky / AlmaLinux / Fedora / CentOS."
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
case "$HOST_ARCH" in
|
||||||
|
x86_64|aarch64) ;;
|
||||||
|
*) die "Only supports aarch64 / x86_64" ;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
current_kernel="$(uname -r)"
|
||||||
|
lowest="$(printf '%s\n%s\n' "$MIN_KERNEL" "$current_kernel" | sort -V | head -n1)"
|
||||||
|
|
||||||
|
[[ "$lowest" == "$MIN_KERNEL" ]] || die "Kernel $current_kernel is below $MIN_KERNEL"
|
||||||
|
echo "[OK] Kernel $current_kernel verified."
|
||||||
|
}
|
||||||
|
|
||||||
|
install_dependencies() {
|
||||||
|
local install_ok=0
|
||||||
|
|
||||||
|
if command -v dnf >/dev/null 2>&1; then
|
||||||
|
sudo dnf -y install rpm-build rpmdevtools curl unzip tar jq rsync dotnet-sdk-10.0 \
|
||||||
|
&& install_ok=1
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ "$install_ok" -ne 1 ]]; then
|
||||||
|
echo "Could not auto-install dependencies for '$OS_ID'. Make sure these are available:"
|
||||||
|
echo "dotnet-sdk 10.x, curl, unzip, tar, rsync, rpm, rpmdevtools, rpm-build (on Red Hat branch)"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
prepare_workspace() {
|
||||||
|
SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)"
|
||||||
|
cd "$SCRIPT_DIR"
|
||||||
|
|
||||||
|
if [[ -f .gitmodules ]]; then
|
||||||
|
git submodule sync --recursive || true
|
||||||
|
git submodule update --init --recursive || true
|
||||||
|
fi
|
||||||
|
|
||||||
|
PROJECT="$PROJECT_HINT"
|
||||||
|
[[ -f "$PROJECT" ]] || PROJECT="$(find . -maxdepth 3 -name 'v2rayN.Desktop.csproj' | head -n1 || true)"
|
||||||
|
[[ -f "$PROJECT" ]] || die "v2rayN.Desktop.csproj not found"
|
||||||
|
}
|
||||||
|
|
||||||
|
choose_channel() {
|
||||||
|
local ch="latest"
|
||||||
|
local sel=""
|
||||||
|
|
||||||
|
if [[ -n "${BUILD_FROM:-}" ]]; then
|
||||||
|
case "$BUILD_FROM" in
|
||||||
|
1) echo "latest"; return 0 ;;
|
||||||
|
2) echo "prerelease"; return 0 ;;
|
||||||
|
3) echo "keep"; return 0 ;;
|
||||||
|
*) die "[ERROR] Invalid --buildfrom value: ${BUILD_FROM}. Use 1|2|3." ;;
|
||||||
|
esac
|
||||||
|
fi
|
||||||
|
|
||||||
if [[ -t 0 ]]; then
|
if [[ -t 0 ]]; then
|
||||||
echo "[?] Choose v2rayN release channel:" >&2
|
echo "[?] Choose v2rayN release channel:" >&2
|
||||||
@@ -141,29 +164,35 @@ get_latest_tag_prerelease() {
|
|||||||
| sed 's/^v//'
|
| sed 's/^v//'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
sync_submodules() {
|
||||||
|
if [[ -f .gitmodules ]]; then
|
||||||
|
git submodule sync --recursive || true
|
||||||
|
git submodule update --init --recursive || true
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
git_try_checkout() {
|
git_try_checkout() {
|
||||||
# Try a series of refs and checkout when found.
|
local want="$1"
|
||||||
local want="$1" ref=""
|
local ref=""
|
||||||
|
|
||||||
if git rev-parse --git-dir >/dev/null 2>&1; then
|
if git rev-parse --git-dir >/dev/null 2>&1; then
|
||||||
git fetch --tags --force --prune --depth=1 || true
|
git fetch --tags --force --prune --depth=1 || true
|
||||||
if git rev-parse "refs/tags/${want}" >/dev/null 2>&1; then
|
git rev-parse "refs/tags/${want}" >/dev/null 2>&1 && ref="$want"
|
||||||
ref="${want}"
|
|
||||||
fi
|
|
||||||
if [[ -n "$ref" ]]; then
|
if [[ -n "$ref" ]]; then
|
||||||
echo "[OK] Found ref '${ref}', checking out..."
|
echo "[OK] Found ref '${ref}', checking out..."
|
||||||
git checkout -f "${ref}"
|
git checkout -f "$ref"
|
||||||
if [[ -f .gitmodules ]]; then
|
sync_submodules
|
||||||
git submodule sync --recursive || true
|
|
||||||
git submodule update --init --recursive || true
|
|
||||||
fi
|
|
||||||
return 0
|
return 0
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
return 1
|
return 1
|
||||||
}
|
}
|
||||||
|
|
||||||
apply_channel_or_keep() {
|
apply_channel_or_keep() {
|
||||||
local ch="$1" tag
|
local ch="$1"
|
||||||
|
local tag=""
|
||||||
|
|
||||||
if [[ "$ch" == "keep" ]]; then
|
if [[ "$ch" == "keep" ]]; then
|
||||||
echo "[*] Keep current repository state (no checkout)."
|
echo "[*] Keep current repository state (no checkout)."
|
||||||
@@ -173,102 +202,154 @@ apply_channel_or_keep() {
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
echo "[*] Resolving ${ch} tag from GitHub releases..."
|
echo "[*] Resolving ${ch} tag from GitHub releases..."
|
||||||
if [[ "$ch" == "prerelease" ]]; then
|
|
||||||
tag="$(get_latest_tag_prerelease || true)"
|
|
||||||
else
|
|
||||||
tag="$(get_latest_tag_latest || true)"
|
|
||||||
fi
|
|
||||||
|
|
||||||
[[ -n "$tag" ]] || { echo "Failed to resolve latest tag for channel '${ch}'."; exit 1; }
|
case "$ch" in
|
||||||
|
latest) tag="$(get_latest_tag_latest || true)" ;;
|
||||||
|
prerelease) tag="$(get_latest_tag_prerelease || true)" ;;
|
||||||
|
*) die "Failed to resolve latest tag for channel '${ch}'." ;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
[[ -n "$tag" ]] || die "Failed to resolve latest tag for channel '${ch}'."
|
||||||
|
|
||||||
echo "[*] Latest tag for '${ch}': ${tag}"
|
echo "[*] Latest tag for '${ch}': ${tag}"
|
||||||
git_try_checkout "$tag" || { echo "Failed to checkout '${tag}'."; exit 1; }
|
git_try_checkout "$tag" || die "Failed to checkout '${tag}'."
|
||||||
VERSION="${tag#v}"
|
VERSION="${tag#v}"
|
||||||
}
|
}
|
||||||
|
|
||||||
if git rev-parse --git-dir >/dev/null 2>&1; then
|
resolve_version() {
|
||||||
if [[ -n "${VERSION_ARG:-}" ]]; then
|
if git rev-parse --git-dir >/dev/null 2>&1; then
|
||||||
clean_ver="${VERSION_ARG#v}"
|
if [[ -n "${VERSION_ARG:-}" ]]; then
|
||||||
if git_try_checkout "$clean_ver"; then
|
local clean_ver="${VERSION_ARG#v}"
|
||||||
VERSION="$clean_ver"
|
|
||||||
|
if git_try_checkout "$clean_ver"; then
|
||||||
|
VERSION="$clean_ver"
|
||||||
|
else
|
||||||
|
echo "[WARN] Tag '${VERSION_ARG}' not found."
|
||||||
|
apply_channel_or_keep "$(choose_channel)"
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
echo "[WARN] Tag '${VERSION_ARG}' not found."
|
apply_channel_or_keep "$(choose_channel)"
|
||||||
ch="$(choose_channel)"
|
|
||||||
apply_channel_or_keep "$ch"
|
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
ch="$(choose_channel)"
|
echo "Current directory is not a git repo; proceeding on current tree."
|
||||||
apply_channel_or_keep "$ch"
|
VERSION="${VERSION_ARG:-0.0.0}"
|
||||||
fi
|
fi
|
||||||
else
|
|
||||||
echo "Current directory is not a git repo; proceeding on current tree."
|
|
||||||
VERSION="${VERSION_ARG:-0.0.0}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
VERSION="${VERSION#v}"
|
VERSION="${VERSION#v}"
|
||||||
echo "[*] GUI version resolved as: ${VERSION}"
|
echo "[*] GUI version resolved as: ${VERSION}"
|
||||||
|
}
|
||||||
|
|
||||||
|
xray_url_for_rid() {
|
||||||
|
local rid="$1"
|
||||||
|
local ver="$2"
|
||||||
|
|
||||||
|
case "$rid" in
|
||||||
|
linux-x64) echo "https://github.com/XTLS/Xray-core/releases/download/v${ver}/Xray-linux-64.zip" ;;
|
||||||
|
linux-arm64) echo "https://github.com/XTLS/Xray-core/releases/download/v${ver}/Xray-linux-arm64-v8a.zip" ;;
|
||||||
|
*) return 1 ;;
|
||||||
|
esac
|
||||||
|
}
|
||||||
|
|
||||||
|
singbox_url_for_rid() {
|
||||||
|
local rid="$1"
|
||||||
|
local ver="$2"
|
||||||
|
|
||||||
|
case "$rid" in
|
||||||
|
linux-x64) echo "https://github.com/SagerNet/sing-box/releases/download/v${ver}/sing-box-${ver}-linux-amd64.tar.gz" ;;
|
||||||
|
linux-arm64) echo "https://github.com/SagerNet/sing-box/releases/download/v${ver}/sing-box-${ver}-linux-arm64.tar.gz" ;;
|
||||||
|
*) return 1 ;;
|
||||||
|
esac
|
||||||
|
}
|
||||||
|
|
||||||
|
bundle_url_for_rid() {
|
||||||
|
local rid="$1"
|
||||||
|
|
||||||
|
case "$rid" in
|
||||||
|
linux-x64) echo "https://raw.githubusercontent.com/2dust/v2rayN-core-bin/refs/heads/master/v2rayN-linux-64.zip" ;;
|
||||||
|
linux-arm64) echo "https://raw.githubusercontent.com/2dust/v2rayN-core-bin/refs/heads/master/v2rayN-linux-arm64.zip" ;;
|
||||||
|
*) return 1 ;;
|
||||||
|
esac
|
||||||
|
}
|
||||||
|
|
||||||
# Helpers for core
|
|
||||||
download_xray() {
|
download_xray() {
|
||||||
# Download Xray core
|
local outdir="$1"
|
||||||
local outdir="$1" rid="$2" ver="${XRAY_VER:-}" url tmp zipname="xray.zip"
|
local rid="$2"
|
||||||
|
local ver="${XRAY_VER:-}"
|
||||||
|
local url=""
|
||||||
|
local tmp=""
|
||||||
|
|
||||||
mkdir -p "$outdir"
|
mkdir -p "$outdir"
|
||||||
|
|
||||||
if [[ -z "$ver" ]]; then
|
if [[ -z "$ver" ]]; then
|
||||||
ver="$(curl -fsSL https://api.github.com/repos/XTLS/Xray-core/releases/latest \
|
ver="$(curl -fsSL https://api.github.com/repos/XTLS/Xray-core/releases/latest \
|
||||||
| grep -Eo '"tag_name":\s*"v[^"]+"' | sed -E 's/.*"v([^"]+)".*/\1/' | head -n1)" || true
|
| grep -Eo '"tag_name":\s*"v[^"]+"' \
|
||||||
|
| sed -E 's/.*"v([^"]+)".*/\1/' \
|
||||||
|
| head -n1)" || true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
[[ -n "$ver" ]] || { echo "[xray] Failed to get version"; return 1; }
|
[[ -n "$ver" ]] || { echo "[xray] Failed to get version"; return 1; }
|
||||||
if [[ "$rid" == "linux-arm64" ]]; then
|
url="$(xray_url_for_rid "$rid" "$ver")" || { echo "[xray] Unsupported RID: $rid"; return 1; }
|
||||||
url="https://github.com/XTLS/Xray-core/releases/download/v${ver}/Xray-linux-arm64-v8a.zip"
|
|
||||||
else
|
|
||||||
url="https://github.com/XTLS/Xray-core/releases/download/v${ver}/Xray-linux-64.zip"
|
|
||||||
fi
|
|
||||||
echo "[+] Download xray: $url"
|
echo "[+] Download xray: $url"
|
||||||
|
|
||||||
tmp="$(mktemp -d)"
|
tmp="$(mktemp -d)"
|
||||||
curl -fL "$url" -o "$tmp/$zipname"
|
curl -fL "$url" -o "$tmp/xray.zip" || { rm -rf "$tmp"; return 1; }
|
||||||
unzip -q "$tmp/$zipname" -d "$tmp"
|
unzip -q "$tmp/xray.zip" -d "$tmp" || { rm -rf "$tmp"; return 1; }
|
||||||
install -m 755 "$tmp/xray" "$outdir/xray"
|
install -m 755 "$tmp/xray" "$outdir/xray" || { rm -rf "$tmp"; return 1; }
|
||||||
rm -rf "$tmp"
|
rm -rf "$tmp"
|
||||||
}
|
}
|
||||||
|
|
||||||
download_singbox() {
|
download_singbox() {
|
||||||
# Download sing-box
|
local outdir="$1"
|
||||||
local outdir="$1" rid="$2" ver="${SING_VER:-}" url tmp tarname="singbox.tar.gz" bin cronet
|
local rid="$2"
|
||||||
|
local ver="${SING_VER:-}"
|
||||||
|
local url=""
|
||||||
|
local tmp=""
|
||||||
|
local bin=""
|
||||||
|
local cronet=""
|
||||||
|
|
||||||
mkdir -p "$outdir"
|
mkdir -p "$outdir"
|
||||||
|
|
||||||
if [[ -z "$ver" ]]; then
|
if [[ -z "$ver" ]]; then
|
||||||
ver="$(curl -fsSL https://api.github.com/repos/SagerNet/sing-box/releases/latest \
|
ver="$(curl -fsSL https://api.github.com/repos/SagerNet/sing-box/releases/latest \
|
||||||
| grep -Eo '"tag_name":\s*"v[^"]+"' \
|
| grep -Eo '"tag_name":\s*"v[^"]+"' \
|
||||||
| sed -E 's/.*"v([^"]+)".*/\1/' \
|
| sed -E 's/.*"v([^"]+)".*/\1/' \
|
||||||
| head -n1)" || true
|
| head -n1)" || true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
[[ -n "$ver" ]] || { echo "[sing-box] Failed to get version"; return 1; }
|
[[ -n "$ver" ]] || { echo "[sing-box] Failed to get version"; return 1; }
|
||||||
if [[ "$rid" == "linux-arm64" ]]; then
|
url="$(singbox_url_for_rid "$rid" "$ver")" || { echo "[sing-box] Unsupported RID: $rid"; return 1; }
|
||||||
url="https://github.com/SagerNet/sing-box/releases/download/v${ver}/sing-box-${ver}-linux-arm64.tar.gz"
|
|
||||||
else
|
|
||||||
url="https://github.com/SagerNet/sing-box/releases/download/v${ver}/sing-box-${ver}-linux-amd64.tar.gz"
|
|
||||||
fi
|
|
||||||
echo "[+] Download sing-box: $url"
|
echo "[+] Download sing-box: $url"
|
||||||
|
|
||||||
tmp="$(mktemp -d)"
|
tmp="$(mktemp -d)"
|
||||||
curl -fL "$url" -o "$tmp/$tarname"
|
curl -fL "$url" -o "$tmp/singbox.tar.gz" || { rm -rf "$tmp"; return 1; }
|
||||||
tar -C "$tmp" -xzf "$tmp/$tarname"
|
tar -C "$tmp" -xzf "$tmp/singbox.tar.gz" || { rm -rf "$tmp"; return 1; }
|
||||||
|
|
||||||
bin="$(find "$tmp" -type f -name 'sing-box' | head -n1 || true)"
|
bin="$(find "$tmp" -type f -name 'sing-box' | head -n1 || true)"
|
||||||
[[ -n "$bin" ]] || { echo "[!] sing-box unpack failed"; rm -rf "$tmp"; return 1; }
|
[[ -n "$bin" ]] || { echo "[!] sing-box unpack failed"; rm -rf "$tmp"; return 1; }
|
||||||
install -m 755 "$bin" "$outdir/sing-box"
|
|
||||||
|
install -m 755 "$bin" "$outdir/sing-box" || { rm -rf "$tmp"; return 1; }
|
||||||
|
|
||||||
cronet="$(find "$tmp" -type f -name 'libcronet*.so*' | head -n1 || true)"
|
cronet="$(find "$tmp" -type f -name 'libcronet*.so*' | head -n1 || true)"
|
||||||
[[ -n "$cronet" ]] && install -m 644 "$cronet" "$outdir/libcronet.so"
|
[[ -n "$cronet" ]] && install -m 644 "$cronet" "$outdir/libcronet.so" || true
|
||||||
|
|
||||||
rm -rf "$tmp"
|
rm -rf "$tmp"
|
||||||
}
|
}
|
||||||
|
|
||||||
# Move geo files to outroot/bin
|
|
||||||
unify_geo_layout() {
|
unify_geo_layout() {
|
||||||
local outroot="$1"
|
local outroot="$1"
|
||||||
mkdir -p "$outroot/bin"
|
local n
|
||||||
local names=( \
|
local names=(
|
||||||
"geosite.dat" \
|
geosite.dat
|
||||||
"geoip.dat" \
|
geoip.dat
|
||||||
"geoip-only-cn-private.dat" \
|
geoip-only-cn-private.dat
|
||||||
"Country.mmdb" \
|
Country.mmdb
|
||||||
"geoip.metadb" \
|
geoip.metadb
|
||||||
)
|
)
|
||||||
|
|
||||||
|
mkdir -p "$outroot/bin"
|
||||||
|
|
||||||
for n in "${names[@]}"; do
|
for n in "${names[@]}"; do
|
||||||
if [[ -f "$outroot/bin/xray/$n" ]]; then
|
if [[ -f "$outroot/bin/xray/$n" ]]; then
|
||||||
mv -f "$outroot/bin/xray/$n" "$outroot/bin/$n"
|
mv -f "$outroot/bin/xray/$n" "$outroot/bin/$n"
|
||||||
@@ -276,58 +357,48 @@ unify_geo_layout() {
|
|||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
# Download geo/rule assets
|
|
||||||
download_geo_assets() {
|
download_geo_assets() {
|
||||||
local outroot="$1"
|
local outroot="$1"
|
||||||
local bin_dir="$outroot/bin"
|
local bin_dir="$outroot/bin"
|
||||||
local srss_dir="$bin_dir/srss"
|
local srss_dir="$bin_dir/srss"
|
||||||
|
local f=""
|
||||||
|
|
||||||
mkdir -p "$bin_dir" "$srss_dir"
|
mkdir -p "$bin_dir" "$srss_dir"
|
||||||
|
|
||||||
echo "[+] Download Xray Geo to ${bin_dir}"
|
echo "[+] Download Xray Geo to ${bin_dir}"
|
||||||
curl -fsSL -o "$bin_dir/geosite.dat" \
|
curl -fsSL -o "$bin_dir/geosite.dat" "https://github.com/Loyalsoldier/V2ray-rules-dat/releases/latest/download/geosite.dat"
|
||||||
"https://github.com/Loyalsoldier/V2ray-rules-dat/releases/latest/download/geosite.dat"
|
curl -fsSL -o "$bin_dir/geoip.dat" "https://github.com/Loyalsoldier/V2ray-rules-dat/releases/latest/download/geoip.dat"
|
||||||
curl -fsSL -o "$bin_dir/geoip.dat" \
|
curl -fsSL -o "$bin_dir/geoip-only-cn-private.dat" "https://raw.githubusercontent.com/Loyalsoldier/geoip/release/geoip-only-cn-private.dat"
|
||||||
"https://github.com/Loyalsoldier/V2ray-rules-dat/releases/latest/download/geoip.dat"
|
curl -fsSL -o "$bin_dir/Country.mmdb" "https://raw.githubusercontent.com/Loyalsoldier/geoip/release/Country.mmdb"
|
||||||
curl -fsSL -o "$bin_dir/geoip-only-cn-private.dat" \
|
|
||||||
"https://raw.githubusercontent.com/Loyalsoldier/geoip/release/geoip-only-cn-private.dat"
|
|
||||||
curl -fsSL -o "$bin_dir/Country.mmdb" \
|
|
||||||
"https://raw.githubusercontent.com/Loyalsoldier/geoip/release/Country.mmdb"
|
|
||||||
|
|
||||||
echo "[+] Download sing-box rule DB & rule-sets"
|
echo "[+] Download sing-box rule DB & rule-sets"
|
||||||
curl -fsSL -o "$bin_dir/geoip.metadb" \
|
curl -fsSL -o "$bin_dir/geoip.metadb" "https://github.com/MetaCubeX/meta-rules-dat/releases/latest/download/geoip.metadb"
|
||||||
"https://github.com/MetaCubeX/meta-rules-dat/releases/latest/download/geoip.metadb" || true
|
|
||||||
|
|
||||||
for f in \
|
for f in geoip-private.srs geoip-cn.srs geoip-facebook.srs geoip-fastly.srs geoip-google.srs geoip-netflix.srs geoip-telegram.srs geoip-twitter.srs; do
|
||||||
geoip-private.srs geoip-cn.srs geoip-facebook.srs geoip-fastly.srs \
|
curl -fsSL -o "$srss_dir/$f" "https://raw.githubusercontent.com/2dust/sing-box-rules/refs/heads/rule-set-geoip/$f"
|
||||||
geoip-google.srs geoip-netflix.srs geoip-telegram.srs geoip-twitter.srs; do
|
done
|
||||||
curl -fsSL -o "$srss_dir/$f" \
|
|
||||||
"https://raw.githubusercontent.com/2dust/sing-box-rules/rule-set-geoip/$f" || true
|
for f in geosite-cn.srs geosite-gfw.srs geosite-google.srs geosite-greatfire.srs geosite-geolocation-cn.srs geosite-category-ads-all.srs geosite-private.srs; do
|
||||||
done
|
curl -fsSL -o "$srss_dir/$f" "https://raw.githubusercontent.com/2dust/sing-box-rules/refs/heads/rule-set-geosite/$f"
|
||||||
for f in \
|
|
||||||
geosite-cn.srs geosite-gfw.srs geosite-google.srs geosite-greatfire.srs \
|
|
||||||
geosite-geolocation-cn.srs geosite-category-ads-all.srs geosite-private.srs; do
|
|
||||||
curl -fsSL -o "$srss_dir/$f" \
|
|
||||||
"https://raw.githubusercontent.com/2dust/sing-box-rules/rule-set-geosite/$f" || true
|
|
||||||
done
|
done
|
||||||
|
|
||||||
# Unify to bin
|
|
||||||
unify_geo_layout "$outroot"
|
unify_geo_layout "$outroot"
|
||||||
}
|
}
|
||||||
|
|
||||||
# Prefer the prebuilt v2rayN core bundle; then unify geo layout
|
populate_assets_zip_mode() {
|
||||||
download_v2rayn_bundle() {
|
local outroot="$1"
|
||||||
local outroot="$1" rid="$2"
|
local rid="$2"
|
||||||
local url=""
|
local url=""
|
||||||
if [[ "$rid" == "linux-arm64" ]]; then
|
local tmp=""
|
||||||
url="https://raw.githubusercontent.com/2dust/v2rayN-core-bin/refs/heads/master/v2rayN-linux-arm64.zip"
|
local nested_dir=""
|
||||||
else
|
|
||||||
url="https://raw.githubusercontent.com/2dust/v2rayN-core-bin/refs/heads/master/v2rayN-linux-64.zip"
|
url="$(bundle_url_for_rid "$rid")" || { echo "[!] Bundle unsupported RID: $rid"; return 1; }
|
||||||
fi
|
|
||||||
echo "[+] Try v2rayN bundle archive: $url"
|
echo "[+] Try v2rayN bundle archive: $url"
|
||||||
local tmp zipname
|
|
||||||
tmp="$(mktemp -d)"; zipname="$tmp/v2rayn.zip"
|
tmp="$(mktemp -d)"
|
||||||
curl -fL "$url" -o "$zipname" || { echo "[!] Bundle download failed"; return 1; }
|
curl -fL "$url" -o "$tmp/v2rayn.zip" || { echo "[!] Bundle download failed"; rm -rf "$tmp"; return 1; }
|
||||||
unzip -q "$zipname" -d "$tmp" || { echo "[!] Bundle unzip failed"; return 1; }
|
unzip -q "$tmp/v2rayn.zip" -d "$tmp" || { echo "[!] Bundle unzip failed"; rm -rf "$tmp"; return 1; }
|
||||||
|
|
||||||
if [[ -d "$tmp/bin" ]]; then
|
if [[ -d "$tmp/bin" ]]; then
|
||||||
mkdir -p "$outroot/bin"
|
mkdir -p "$outroot/bin"
|
||||||
@@ -339,7 +410,6 @@ download_v2rayn_bundle() {
|
|||||||
rm -f "$outroot/v2rayn.zip" 2>/dev/null || true
|
rm -f "$outroot/v2rayn.zip" 2>/dev/null || true
|
||||||
find "$outroot" -type d -name "mihomo" -prune -exec rm -rf {} + 2>/dev/null || true
|
find "$outroot" -type d -name "mihomo" -prune -exec rm -rf {} + 2>/dev/null || true
|
||||||
|
|
||||||
local nested_dir
|
|
||||||
nested_dir="$(find "$outroot" -maxdepth 1 -type d -name 'v2rayN-linux-*' | head -n1 || true)"
|
nested_dir="$(find "$outroot" -maxdepth 1 -type d -name 'v2rayN-linux-*' | head -n1 || true)"
|
||||||
if [[ -n "$nested_dir" && -d "$nested_dir/bin" ]]; then
|
if [[ -n "$nested_dir" && -d "$nested_dir/bin" ]]; then
|
||||||
mkdir -p "$outroot/bin"
|
mkdir -p "$outroot/bin"
|
||||||
@@ -347,109 +417,74 @@ download_v2rayn_bundle() {
|
|||||||
rm -rf "$nested_dir"
|
rm -rf "$nested_dir"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Unify to bin/
|
|
||||||
unify_geo_layout "$outroot"
|
unify_geo_layout "$outroot"
|
||||||
|
rm -rf "$tmp"
|
||||||
|
|
||||||
echo "[+] Bundle extracted to $outroot"
|
echo "[+] Bundle extracted to $outroot"
|
||||||
}
|
}
|
||||||
|
|
||||||
# ===== Build results collection for --arch all ========================================
|
populate_assets_netcore_mode() {
|
||||||
BUILT_RPMS=() # Will collect absolute paths of built RPMs
|
local outroot="$1"
|
||||||
BUILT_ALL=0 # Flag to know if we should print the final summary
|
local rid="$2"
|
||||||
|
|
||||||
# ===== Build (single-arch) function ====================================================
|
mkdir -p "$outroot/bin/xray" "$outroot/bin/sing_box"
|
||||||
build_for_arch() {
|
|
||||||
# $1: target short arch: x64 | arm64
|
|
||||||
local short="$1"
|
|
||||||
local rid rpm_target archdir
|
|
||||||
case "$short" in
|
|
||||||
x64) rid="linux-x64"; rpm_target="x86_64"; archdir="x86_64" ;;
|
|
||||||
arm64) rid="linux-arm64"; rpm_target="aarch64"; archdir="aarch64" ;;
|
|
||||||
*) echo "Unknown arch '$short' (use x64|arm64)"; return 1;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
echo "[*] Building for target: $short (RID=$rid, RPM --target $rpm_target)"
|
if [[ "$WITH_CORE" == "xray" || "$WITH_CORE" == "both" ]]; then
|
||||||
|
download_xray "$outroot/bin/xray" "$rid" || echo "[!] xray download failed (skipped)"
|
||||||
|
fi
|
||||||
|
|
||||||
# .NET publish (self-contained) for this RID
|
if [[ "$WITH_CORE" == "sing-box" || "$WITH_CORE" == "both" ]]; then
|
||||||
dotnet clean "$PROJECT" -c Release
|
download_singbox "$outroot/bin/sing_box" "$rid" || echo "[!] sing-box download failed (skipped)"
|
||||||
rm -rf "$(dirname "$PROJECT")/bin/Release/net10.0" || true
|
fi
|
||||||
|
|
||||||
dotnet restore "$PROJECT"
|
download_geo_assets "$outroot" || echo "[!] Geo rules download failed (skipped)"
|
||||||
dotnet publish "$PROJECT" \
|
}
|
||||||
-c Release -r "$rid" \
|
|
||||||
-p:PublishSingleFile=false \
|
|
||||||
-p:SelfContained=true
|
|
||||||
|
|
||||||
# Per-arch variables (scoped)
|
stage_runtime_assets() {
|
||||||
local RID_DIR="$rid"
|
local outroot="$1"
|
||||||
local PUBDIR
|
local rid="$2"
|
||||||
PUBDIR="$(dirname "$PROJECT")/bin/Release/net10.0/${RID_DIR}/publish"
|
|
||||||
[[ -d "$PUBDIR" ]] || { echo "Publish directory not found: $PUBDIR"; return 1; }
|
|
||||||
|
|
||||||
# Per-arch working area
|
mkdir -p "$outroot/bin/xray" "$outroot/bin/sing_box"
|
||||||
local PKGROOT="v2rayN-publish"
|
|
||||||
local WORKDIR
|
|
||||||
WORKDIR="$(mktemp -d)"
|
|
||||||
trap '[[ -n "${WORKDIR:-}" ]] && rm -rf "$WORKDIR"' RETURN
|
|
||||||
|
|
||||||
# rpmbuild topdir selection
|
|
||||||
local TOPDIR SPECDIR SOURCEDIR
|
|
||||||
rpmdev-setuptree
|
|
||||||
TOPDIR="${HOME}/rpmbuild"
|
|
||||||
SPECDIR="${TOPDIR}/SPECS"
|
|
||||||
SOURCEDIR="${TOPDIR}/SOURCES"
|
|
||||||
|
|
||||||
# Stage publish content
|
|
||||||
mkdir -p "$WORKDIR/$PKGROOT"
|
|
||||||
cp -a "$PUBDIR/." "$WORKDIR/$PKGROOT/"
|
|
||||||
|
|
||||||
# Required icon
|
|
||||||
local ICON_CANDIDATE
|
|
||||||
PROJECT_DIR="$(cd "$(dirname "$PROJECT")" && pwd)"
|
|
||||||
ICON_CANDIDATE="$PROJECT_DIR/v2rayN.png"
|
|
||||||
[[ -f "$ICON_CANDIDATE" ]] || { echo "Required icon not found: $ICON_CANDIDATE"; return 1; }
|
|
||||||
cp "$ICON_CANDIDATE" "$WORKDIR/$PKGROOT/v2rayn.png"
|
|
||||||
|
|
||||||
# Prepare bin structure
|
|
||||||
mkdir -p "$WORKDIR/$PKGROOT/bin/xray" "$WORKDIR/$PKGROOT/bin/sing_box"
|
|
||||||
|
|
||||||
# Bundle / cores per-arch
|
|
||||||
fetch_separate_cores_and_rules() {
|
|
||||||
local outroot="$1"
|
|
||||||
|
|
||||||
if [[ "$WITH_CORE" == "xray" || "$WITH_CORE" == "both" ]]; then
|
|
||||||
download_xray "$outroot/bin/xray" "$RID_DIR" || echo "[!] xray download failed (skipped)"
|
|
||||||
fi
|
|
||||||
if [[ "$WITH_CORE" == "sing-box" || "$WITH_CORE" == "both" ]]; then
|
|
||||||
download_singbox "$outroot/bin/sing_box" "$RID_DIR" || echo "[!] sing-box download failed (skipped)"
|
|
||||||
fi
|
|
||||||
download_geo_assets "$outroot" || echo "[!] Geo rules download failed (skipped)"
|
|
||||||
}
|
|
||||||
|
|
||||||
if [[ "$FORCE_NETCORE" -eq 0 ]]; then
|
if [[ "$FORCE_NETCORE" -eq 0 ]]; then
|
||||||
if download_v2rayn_bundle "$WORKDIR/$PKGROOT" "$RID_DIR"; then
|
if populate_assets_zip_mode "$outroot" "$rid"; then
|
||||||
echo "[*] Using v2rayN bundle archive."
|
echo "[*] Using v2rayN bundle archive."
|
||||||
else
|
else
|
||||||
echo "[*] Bundle failed, fallback to separate core + rules."
|
echo "[*] Bundle failed, fallback to separate core + rules."
|
||||||
fetch_separate_cores_and_rules "$WORKDIR/$PKGROOT"
|
populate_assets_netcore_mode "$outroot" "$rid"
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
echo "[*] --netcore specified: use separate core + rules."
|
echo "[*] --netcore specified: use separate core + rules."
|
||||||
fetch_separate_cores_and_rules "$WORKDIR/$PKGROOT"
|
populate_assets_netcore_mode "$outroot" "$rid"
|
||||||
fi
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
# Tarball
|
describe_target() {
|
||||||
mkdir -p "$SOURCEDIR"
|
local short="$1"
|
||||||
tar -C "$WORKDIR" -czf "$SOURCEDIR/$PKGROOT.tar.gz" "$PKGROOT"
|
|
||||||
|
|
||||||
# SPEC
|
case "$short" in
|
||||||
local SPECFILE="$SPECDIR/v2rayN.spec"
|
x64) printf '%s\n%s\n%s\n' "linux-x64" "x86_64" "x86_64" ;;
|
||||||
mkdir -p "$SPECDIR"
|
arm64) printf '%s\n%s\n%s\n' "linux-arm64" "aarch64" "aarch64" ;;
|
||||||
cat > "$SPECFILE" <<'SPEC'
|
*) echo "Unknown arch '$short' (use x64|arm64)" >&2; return 1 ;;
|
||||||
|
esac
|
||||||
|
}
|
||||||
|
|
||||||
|
publish_binary() {
|
||||||
|
local rid="$1"
|
||||||
|
|
||||||
|
dotnet clean "$PROJECT" -c Release
|
||||||
|
rm -rf "$(dirname "$PROJECT")/bin/Release/net10.0" || true
|
||||||
|
dotnet restore "$PROJECT"
|
||||||
|
dotnet publish "$PROJECT" -c Release -r "$rid" -p:PublishSingleFile=false -p:SelfContained=true
|
||||||
|
}
|
||||||
|
|
||||||
|
write_spec_file() {
|
||||||
|
local specfile="$1"
|
||||||
|
|
||||||
|
cat > "$specfile" <<'SPEC'
|
||||||
%global debug_package %{nil}
|
%global debug_package %{nil}
|
||||||
%undefine _debuginfo_subpackages
|
%undefine _debuginfo_subpackages
|
||||||
%undefine _debugsource_packages
|
%undefine _debugsource_packages
|
||||||
# Ignore outdated LTTng dependencies incorrectly reported by the .NET runtime (to avoid installation failures)
|
|
||||||
%global __requires_exclude ^liblttng-ust\.so\..*$
|
%global __requires_exclude ^liblttng-ust\.so\..*$
|
||||||
|
|
||||||
Name: v2rayN
|
Name: v2rayN
|
||||||
@@ -462,7 +497,6 @@ BugURL: https://github.com/2dust/v2rayN/issues
|
|||||||
ExclusiveArch: aarch64 x86_64
|
ExclusiveArch: aarch64 x86_64
|
||||||
Source0: __PKGROOT__.tar.gz
|
Source0: __PKGROOT__.tar.gz
|
||||||
|
|
||||||
# Runtime dependencies (Avalonia / X11 / Fonts / GL)
|
|
||||||
Requires: cairo, pango, openssl, mesa-libEGL, mesa-libGL
|
Requires: cairo, pango, openssl, mesa-libEGL, mesa-libGL
|
||||||
Requires: glibc >= 2.34
|
Requires: glibc >= 2.34
|
||||||
Requires: fontconfig >= 2.13.1
|
Requires: fontconfig >= 2.13.1
|
||||||
@@ -483,28 +517,23 @@ https://github.com/2dust/v2rayN
|
|||||||
%setup -q -n __PKGROOT__
|
%setup -q -n __PKGROOT__
|
||||||
|
|
||||||
%build
|
%build
|
||||||
# no build
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
install -dm0755 %{buildroot}/opt/v2rayN
|
install -dm0755 %{buildroot}/opt/v2rayN
|
||||||
cp -a * %{buildroot}/opt/v2rayN/
|
cp -a * %{buildroot}/opt/v2rayN/
|
||||||
|
|
||||||
# Normalize permissions
|
|
||||||
find %{buildroot}/opt/v2rayN -type d -exec chmod 0755 {} +
|
find %{buildroot}/opt/v2rayN -type d -exec chmod 0755 {} +
|
||||||
find %{buildroot}/opt/v2rayN -type f -exec chmod 0644 {} +
|
find %{buildroot}/opt/v2rayN -type f -exec chmod 0644 {} +
|
||||||
[ -f %{buildroot}/opt/v2rayN/v2rayN ] && chmod 0755 %{buildroot}/opt/v2rayN/v2rayN || :
|
[ -f %{buildroot}/opt/v2rayN/v2rayN ] && chmod 0755 %{buildroot}/opt/v2rayN/v2rayN || :
|
||||||
|
|
||||||
# Launcher (prefer native ELF first, then DLL fallback)
|
|
||||||
install -dm0755 %{buildroot}%{_bindir}
|
install -dm0755 %{buildroot}%{_bindir}
|
||||||
install -m0755 /dev/stdin %{buildroot}%{_bindir}/v2rayn << 'EOF'
|
install -m0755 /dev/stdin %{buildroot}%{_bindir}/v2rayn << 'EOF'
|
||||||
#!/usr/bin/bash
|
#!/usr/bin/bash
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
DIR="/opt/v2rayN"
|
DIR="/opt/v2rayN"
|
||||||
|
|
||||||
# Prefer native apphost
|
|
||||||
if [[ -x "$DIR/v2rayN" ]]; then exec "$DIR/v2rayN" "$@"; fi
|
if [[ -x "$DIR/v2rayN" ]]; then exec "$DIR/v2rayN" "$@"; fi
|
||||||
|
|
||||||
# DLL fallback
|
|
||||||
for dll in v2rayN.Desktop.dll v2rayN.dll; do
|
for dll in v2rayN.Desktop.dll v2rayN.dll; do
|
||||||
if [[ -f "$DIR/$dll" ]]; then exec /usr/bin/dotnet "$DIR/$dll" "$@"; fi
|
if [[ -f "$DIR/$dll" ]]; then exec /usr/bin/dotnet "$DIR/$dll" "$@"; fi
|
||||||
done
|
done
|
||||||
@@ -514,7 +543,6 @@ ls -l "$DIR" >&2 || true
|
|||||||
exit 1
|
exit 1
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
# Desktop file
|
|
||||||
install -dm0755 %{buildroot}%{_datadir}/applications
|
install -dm0755 %{buildroot}%{_datadir}/applications
|
||||||
install -m0644 /dev/stdin %{buildroot}%{_datadir}/applications/v2rayn.desktop << 'EOF'
|
install -m0644 /dev/stdin %{buildroot}%{_datadir}/applications/v2rayn.desktop << 'EOF'
|
||||||
[Desktop Entry]
|
[Desktop Entry]
|
||||||
@@ -527,7 +555,6 @@ Terminal=false
|
|||||||
Categories=Network;
|
Categories=Network;
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
# Icon
|
|
||||||
install -dm0755 %{buildroot}%{_datadir}/icons/hicolor/256x256/apps
|
install -dm0755 %{buildroot}%{_datadir}/icons/hicolor/256x256/apps
|
||||||
install -m0644 %{_builddir}/__PKGROOT__/v2rayn.png %{buildroot}%{_datadir}/icons/hicolor/256x256/apps/v2rayn.png
|
install -m0644 %{_builddir}/__PKGROOT__/v2rayn.png %{buildroot}%{_datadir}/icons/hicolor/256x256/apps/v2rayn.png
|
||||||
|
|
||||||
@@ -546,45 +573,129 @@ install -m0644 %{_builddir}/__PKGROOT__/v2rayn.png %{buildroot}%{_datadir}/icons
|
|||||||
%{_datadir}/icons/hicolor/256x256/apps/v2rayn.png
|
%{_datadir}/icons/hicolor/256x256/apps/v2rayn.png
|
||||||
SPEC
|
SPEC
|
||||||
|
|
||||||
# Replace placeholders
|
sed -i "s/__VERSION__/${VERSION}/g" "$specfile"
|
||||||
sed -i "s/__VERSION__/${VERSION}/g" "$SPECFILE"
|
sed -i "s/__PKGROOT__/${PKGROOT}/g" "$specfile"
|
||||||
sed -i "s/__PKGROOT__/${PKGROOT}/g" "$SPECFILE"
|
}
|
||||||
|
|
||||||
# Build RPM for this arch
|
package_binary() {
|
||||||
rpmbuild -ba "$SPECFILE" --target "$rpm_target"
|
local short="$1"
|
||||||
|
local rid="$2"
|
||||||
|
local rpm_target="$3"
|
||||||
|
local archdir="$4"
|
||||||
|
local pubdir=""
|
||||||
|
local workdir=""
|
||||||
|
local specfile=""
|
||||||
|
local sourcedir=""
|
||||||
|
local specdir=""
|
||||||
|
local project_dir=""
|
||||||
|
local icon_candidate=""
|
||||||
|
local f=""
|
||||||
|
|
||||||
|
pubdir="$(dirname "$PROJECT")/bin/Release/net10.0/${rid}/publish"
|
||||||
|
[[ -d "$pubdir" ]] || { echo "Publish directory not found: $pubdir"; return 1; }
|
||||||
|
|
||||||
|
workdir="$(mktemp -d)"
|
||||||
|
trap '[[ -n "${workdir:-}" ]] && rm -rf "$workdir"' RETURN
|
||||||
|
|
||||||
|
mkdir -p "$workdir/$PKGROOT"
|
||||||
|
cp -a "$pubdir/." "$workdir/$PKGROOT/"
|
||||||
|
|
||||||
|
project_dir="$(cd "$(dirname "$PROJECT")" && pwd)"
|
||||||
|
icon_candidate="$project_dir/v2rayN.png"
|
||||||
|
[[ -f "$icon_candidate" ]] || { echo "Required icon not found: $icon_candidate"; return 1; }
|
||||||
|
cp "$icon_candidate" "$workdir/$PKGROOT/v2rayn.png"
|
||||||
|
|
||||||
|
stage_runtime_assets "$workdir/$PKGROOT" "$rid"
|
||||||
|
|
||||||
|
rpmdev-setuptree
|
||||||
|
sourcedir="${RPM_TOPDIR}/SOURCES"
|
||||||
|
specdir="${RPM_TOPDIR}/SPECS"
|
||||||
|
specfile="${specdir}/v2rayN.spec"
|
||||||
|
|
||||||
|
mkdir -p "$sourcedir" "$specdir"
|
||||||
|
tar -C "$workdir" -czf "$sourcedir/$PKGROOT.tar.gz" "$PKGROOT"
|
||||||
|
|
||||||
|
write_spec_file "$specfile"
|
||||||
|
rpmbuild -ba "$specfile" --target "$rpm_target"
|
||||||
|
|
||||||
echo "Build done for $short. RPM at:"
|
echo "Build done for $short. RPM at:"
|
||||||
local f
|
for f in "${RPM_TOPDIR}/RPMS/${archdir}/v2rayN-${VERSION}-1"*.rpm; do
|
||||||
for f in "${TOPDIR}/RPMS/${archdir}/v2rayN-${VERSION}-1"*.rpm; do
|
|
||||||
[[ -e "$f" ]] || continue
|
[[ -e "$f" ]] || continue
|
||||||
echo " $f"
|
echo " $f"
|
||||||
BUILT_RPMS+=("$f")
|
BUILT_RPMS+=("$f")
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
# ===== Arch selection and build orchestration =========================================
|
select_targets() {
|
||||||
case "${ARCH_OVERRIDE:-}" in
|
case "${ARCH_OVERRIDE:-}" in
|
||||||
all) targets=(x64 arm64); BUILT_ALL=1 ;;
|
all) printf '%s\n' x64 arm64 ;;
|
||||||
x64|amd64) targets=(x64) ;;
|
x64|amd64) printf '%s\n' x64 ;;
|
||||||
arm64|aarch64) targets=(arm64) ;;
|
arm64|aarch64) printf '%s\n' arm64 ;;
|
||||||
"") targets=($([[ "$host_arch" == "aarch64" ]] && echo arm64 || echo x64)) ;;
|
"")
|
||||||
*) echo "Unknown --arch '${ARCH_OVERRIDE}'. Use x64|arm64|all."; exit 1 ;;
|
case "$HOST_ARCH" in
|
||||||
esac
|
x86_64) printf '%s\n' x64 ;;
|
||||||
|
aarch64) printf '%s\n' arm64 ;;
|
||||||
|
*) return 1 ;;
|
||||||
|
esac
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
echo "Unknown --arch '${ARCH_OVERRIDE}'. Use x64|arm64|all." >&2
|
||||||
|
return 1
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
}
|
||||||
|
|
||||||
for arch in "${targets[@]}"; do
|
build_one_target() {
|
||||||
build_for_arch "$arch"
|
local short="$1"
|
||||||
done
|
local meta=()
|
||||||
|
local rid=""
|
||||||
|
local rpm_target=""
|
||||||
|
local archdir=""
|
||||||
|
|
||||||
# Print Both arches information
|
mapfile -t meta < <(describe_target "$short") || return 1
|
||||||
if [[ "$BUILT_ALL" -eq 1 ]]; then
|
rid="${meta[0]}"
|
||||||
echo ""
|
rpm_target="${meta[1]}"
|
||||||
echo "================ Build Summary (both architectures) ================"
|
archdir="${meta[2]}"
|
||||||
if [[ "${#BUILT_RPMS[@]}" -gt 0 ]]; then
|
|
||||||
for rp in "${BUILT_RPMS[@]}"; do
|
echo "[*] Building for target: $short (RID=$rid, RPM --target $rpm_target)"
|
||||||
echo "$rp"
|
publish_binary "$rid"
|
||||||
done
|
package_binary "$short" "$rid" "$rpm_target" "$archdir"
|
||||||
else
|
}
|
||||||
echo "No RPMs detected in summary (check build logs above)."
|
|
||||||
|
print_summary() {
|
||||||
|
if [[ "$BUILT_ALL" -eq 1 ]]; then
|
||||||
|
local rp=""
|
||||||
|
echo ""
|
||||||
|
echo "================ Build Summary (both architectures) ================"
|
||||||
|
if [[ "${#BUILT_RPMS[@]}" -gt 0 ]]; then
|
||||||
|
for rp in "${BUILT_RPMS[@]}"; do
|
||||||
|
echo "$rp"
|
||||||
|
done
|
||||||
|
else
|
||||||
|
echo "No RPMs detected in summary (check build logs above)."
|
||||||
|
fi
|
||||||
|
echo "===================================================================="
|
||||||
fi
|
fi
|
||||||
echo "===================================================================="
|
}
|
||||||
fi
|
|
||||||
|
main() {
|
||||||
|
local targets=()
|
||||||
|
local arch=""
|
||||||
|
|
||||||
|
parse_args "$@"
|
||||||
|
detect_environment
|
||||||
|
install_dependencies
|
||||||
|
prepare_workspace
|
||||||
|
resolve_version
|
||||||
|
|
||||||
|
mapfile -t targets < <(select_targets)
|
||||||
|
[[ "${ARCH_OVERRIDE:-}" == "all" ]] && BUILT_ALL=1 || BUILT_ALL=0
|
||||||
|
|
||||||
|
for arch in "${targets[@]}"; do
|
||||||
|
build_one_target "$arch"
|
||||||
|
done
|
||||||
|
|
||||||
|
print_summary
|
||||||
|
}
|
||||||
|
|
||||||
|
main "$@"
|
||||||
@@ -25,12 +25,14 @@
|
|||||||
<PackageVersion Include="Semi.Avalonia.AvaloniaEdit" Version="11.2.0.2" />
|
<PackageVersion Include="Semi.Avalonia.AvaloniaEdit" Version="11.2.0.2" />
|
||||||
<PackageVersion Include="Semi.Avalonia.DataGrid" Version="11.3.7.3" />
|
<PackageVersion Include="Semi.Avalonia.DataGrid" Version="11.3.7.3" />
|
||||||
<PackageVersion Include="NLog" Version="6.1.2" />
|
<PackageVersion Include="NLog" Version="6.1.2" />
|
||||||
<PackageVersion Include="sqlite-net-pcl" Version="1.9.172" />
|
<PackageVersion Include="sqlite-net-e" Version="1.11.0" />
|
||||||
|
<PackageVersion Include="Repobot.SQLite.Unofficial" Version="3.53.1.4" />
|
||||||
<PackageVersion Include="TaskScheduler" Version="2.12.2" />
|
<PackageVersion Include="TaskScheduler" Version="2.12.2" />
|
||||||
|
<PackageVersion Include="Tmds.DBus.Protocol" Version="0.21.3" />
|
||||||
<PackageVersion Include="WebDav.Client" Version="2.9.0" />
|
<PackageVersion Include="WebDav.Client" Version="2.9.0" />
|
||||||
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
|
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
|
||||||
<PackageVersion Include="xunit.v3" Version="3.2.2" />
|
<PackageVersion Include="xunit.v3" Version="3.2.2" />
|
||||||
<PackageVersion Include="YamlDotNet" Version="16.3.0" />
|
<PackageVersion Include="YamlDotNet" Version="16.3.0" />
|
||||||
<PackageVersion Include="ZXing.Net.Bindings.SkiaSharp" Version="0.16.14" />
|
<PackageVersion Include="ZXing.Net.Bindings.SkiaSharp" Version="0.16.14" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
@@ -10,7 +10,8 @@
|
|||||||
<TreatAsUsed>true</TreatAsUsed>
|
<TreatAsUsed>true</TreatAsUsed>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
<PackageReference Include="ReactiveUI.Fody" />
|
<PackageReference Include="ReactiveUI.Fody" />
|
||||||
<PackageReference Include="sqlite-net-pcl" />
|
<PackageReference Include="sqlite-net-e" />
|
||||||
|
<PackageReference Include="Repobot.SQLite.Unofficial" />
|
||||||
<PackageReference Include="NLog" />
|
<PackageReference Include="NLog" />
|
||||||
<PackageReference Include="WebDav.Client" />
|
<PackageReference Include="WebDav.Client" />
|
||||||
<PackageReference Include="YamlDotNet" />
|
<PackageReference Include="YamlDotNet" />
|
||||||
|
|||||||
@@ -301,14 +301,10 @@ public class UpdateService(Config config, Func<bool, string, Task> updateFunc)
|
|||||||
}
|
}
|
||||||
else if (Utils.IsLinux())
|
else if (Utils.IsLinux())
|
||||||
{
|
{
|
||||||
var arch = RuntimeInformation.ProcessArchitecture;
|
return RuntimeInformation.ProcessArchitecture switch
|
||||||
if (arch.ToString().Equals("RiscV64", StringComparison.OrdinalIgnoreCase))
|
|
||||||
{
|
|
||||||
return coreInfo?.DownloadUrlLinuxRiscV64;
|
|
||||||
}
|
|
||||||
return arch switch
|
|
||||||
{
|
{
|
||||||
Architecture.Arm64 => coreInfo?.DownloadUrlLinuxArm64,
|
Architecture.Arm64 => coreInfo?.DownloadUrlLinuxArm64,
|
||||||
|
Architecture.RiscV64 => coreInfo?.DownloadUrlLinuxRiscV64,
|
||||||
Architecture.X64 => coreInfo?.DownloadUrlLinux64,
|
Architecture.X64 => coreInfo?.DownloadUrlLinux64,
|
||||||
_ => null,
|
_ => null,
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user