Alex-Devera/v2rayN
1
0
Fork 0
mirror of https://github.com/2dust/v2rayN.git synced 2025-08-23 03:16:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update package-rhel.sh

Browse source
This commit is contained in:
JieXu 2025-08-19 04:39:12 +08:00 committed by GitHub
parent e104f9f9b2
commit 3093594827
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 274 additions and 102 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

340
package-rhel.sh
View file

@ -1,16 +1,16 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -euo pipefail set -euo pipefail
# ===== Require Red Hat Enterprise Linux / Rocky Linux / AlmaLinux / CentOS Stream ======= # ===== Require Red Hat Enterprise Linux/RockyLinux/AlmaLinux/CentOS OR Ubuntu/Debian ====
if [[ -r /etc/os-release ]]; then if [[ -r /etc/os-release ]]; then
. /etc/os-release . /etc/os-release
case "$ID" in case "$ID" in
rhel|rocky|almalinux|centos) rhel|rocky|almalinux|centos|ubuntu|debian)
echo "[OK] Detected supported system: $NAME $VERSION_ID" echo "[OK] Detected supported system: $NAME $VERSION_ID"
;; ;;
*) *)
echo "[ERROR] Unsupported system: $NAME ($ID)." echo "[ERROR] Unsupported system: $NAME ($ID)."
echo "This script only supports Red Hat Enterprise Linux / Rocky Linux / AlmaLinux / CentOS Stream." echo "This script only supports Red Hat Enterprise Linux/RockyLinux/AlmaLinux/CentOS or Ubuntu/Debian."
exit 1 exit 1
;; ;;
esac esac
@ -24,8 +24,9 @@ VERSION_ARG="${1:-}" # Pass version number like 7.13.8, or leave empty
WITH_CORE="both" # Default: bundle both xray+sing-box WITH_CORE="both" # Default: bundle both xray+sing-box
AUTOSTART=0 # 1 = enable system-wide autostart (/etc/xdg/autostart) AUTOSTART=0 # 1 = enable system-wide autostart (/etc/xdg/autostart)
FORCE_NETCORE=0 # --netcore => skip archive bundle, use separate downloads FORCE_NETCORE=0 # --netcore => skip archive bundle, use separate downloads
ARCH_OVERRIDE="" # --arch x64|arm64 (optional override for RID)
# If the first argument starts with --, don’t treat it as version number # If the first argument starts with --, do not treat it as a version number
if [[ "${VERSION_ARG:-}" == --* ]]; then if [[ "${VERSION_ARG:-}" == --* ]]; then
VERSION_ARG="" VERSION_ARG=""
fi fi
@ -37,28 +38,99 @@ while [[ $# -gt 0 ]]; do
case "$1" in case "$1" in
--with-core) WITH_CORE="${2:-both}"; shift 2;; --with-core) WITH_CORE="${2:-both}"; shift 2;;
--autostart) AUTOSTART=1; shift;; --autostart) AUTOSTART=1; shift;;
--xray-ver) XRAY_VER="${2:-}"; shift 2;; # Specify xray version (optional) --xray-ver) XRAY_VER="${2:-}"; shift 2;;
--singbox-ver) SING_VER="${2:-}"; shift 2;; # Specify sing-box version (optional) --singbox-ver) SING_VER="${2:-}"; shift 2;;
--netcore) FORCE_NETCORE=1; shift;; # NEW: force old mode (no bundle zip) --netcore) FORCE_NETCORE=1; shift;;
--arch) ARCH_OVERRIDE="${2:-}"; shift 2;;
*) *)
if [[ -z "${VERSION_ARG:-}" ]]; then VERSION_ARG="$1"; fi if [[ -z "${VERSION_ARG:-}" ]]; then VERSION_ARG="$1"; fi
shift;; shift;;
esac esac
done done
# ===== Environment check =============================================================== # ===== Environment check + Dependencies ========================================
arch="$(uname -m)" arch="$(uname -m)"
[[ "$arch" == "aarch64" || "$arch" == "x86_64" ]] || { echo "Only supports aarch64 / x86_64"; exit 1; } [[ "$arch" == "aarch64" || "$arch" == "x86_64" ]] || { echo "Only supports aarch64 / x86_64"; exit 1; }
# Dependencies (packaging shouldn’t be run as root, but this line needs sudo) install_ok=0
sudo dnf -y install dotnet-sdk-8.0 rpm-build rpmdevtools curl unzip tar || sudo dnf -y install dotnet-sdk case "$ID" in
# ------------------------------ RHEL family (UNCHANGED) ------------------------------
rhel|rocky|almalinux|centos)
if command -v dnf >/dev/null 2>&1; then
sudo dnf -y install dotnet-sdk-8.0 rpm-build rpmdevtools curl unzip tar rsync || \
sudo dnf -y install dotnet-sdk rpm-build rpmdevtools curl unzip tar rsync
install_ok=1
elif command -v yum >/dev/null 2>&1; then
sudo yum -y install dotnet-sdk-8.0 rpm-build rpmdevtools curl unzip tar rsync || \
sudo yum -y install dotnet-sdk rpm-build rpmdevtools curl unzip tar rsync
install_ok=1
fi
;;
# ------------------------------ Ubuntu (KEEP AS-IS) ---------------------------------
ubuntu)
sudo apt-get update
# Ensure 'universe' (Ubuntu) to get 'rpm'
if ! apt-cache policy | grep -q '^500 .*ubuntu.com/ubuntu.* universe'; then
sudo apt-get -y install software-properties-common || true
sudo add-apt-repository -y universe || true
sudo apt-get update
fi
# Base tools + rpm (provides rpmbuild)
sudo apt-get -y install curl unzip tar rsync rpm || true
# rpmbuild presence check
if ! command -v rpmbuild >/dev/null 2>&1; then
echo "[ERROR] 'rpmbuild' not found after installing 'rpm'."
echo " Please ensure the 'rpm' package is available from your repos (universe on Ubuntu)."
exit 1
fi
# .NET SDK 8 (best effort via apt)
if ! command -v dotnet >/dev/null 2>&1; then
sudo apt-get -y install dotnet-sdk-8.0 || true
sudo apt-get -y install dotnet-sdk-8 || true
sudo apt-get -y install dotnet-sdk || true
fi
install_ok=1
;;
# ------------------------------ Debian (KEEP, with local dotnet install) ------------
debian)
sudo apt-get update
# Base tools + rpm (provides rpmbuild on Debian)
sudo apt-get -y install curl unzip tar rsync rpm || true
# rpmbuild presence check
if ! command -v rpmbuild >/dev/null 2>&1; then
echo "[ERROR] 'rpmbuild' not found after installing 'rpm'."
echo " Please ensure 'rpm' is available from Debian repos."
exit 1
fi
# Try apt for dotnet; fallback to official installer into $HOME/.dotnet
if ! command -v dotnet >/dev/null 2>&1; then
echo "[INFO] 'dotnet' not found. Installing .NET 8 SDK locally to \$HOME/.dotnet ..."
tmp="$(mktemp -d)"; trap 'rm -rf "$tmp"' RETURN
curl -fsSL https://dot.net/v1/dotnet-install.sh -o "$tmp/dotnet-install.sh"
bash "$tmp/dotnet-install.sh" --channel 8.0 --install-dir "$HOME/.dotnet"
export PATH="$HOME/.dotnet:$HOME/.dotnet/tools:$PATH"
export DOTNET_ROOT="$HOME/.dotnet"
if ! command -v dotnet >/dev/null 2>&1; then
echo "[ERROR] dotnet installation failed."
exit 1
fi
fi
install_ok=1
;;
esac
if [[ "$install_ok" -ne 1 ]]; then
echo "[WARN] Could not auto-install dependencies for '$ID'. Make sure these are available:"
echo " dotnet-sdk 8.x, curl, unzip, tar, rsync, rpm, rpmdevtools, rpm-build (on RPM-based distros)"
fi
command -v curl >/dev/null command -v curl >/dev/null
# Root directory = the script's location # Root directory = the script's location
SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)" SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)"
cd "$SCRIPT_DIR" cd "$SCRIPT_DIR"
# Git submodules (tolerant) # Git submodules (best effort)
if [[ -f .gitmodules ]]; then if [[ -f .gitmodules ]]; then
git submodule sync --recursive || true git submodule sync --recursive || true
git submodule update --init --recursive || true git submodule update --init --recursive || true
@ -72,33 +144,34 @@ fi
[[ -f "$PROJECT" ]] || { echo "v2rayN.Desktop.csproj not found"; exit 1; } [[ -f "$PROJECT" ]] || { echo "v2rayN.Desktop.csproj not found"; exit 1; }
# ===== Resolve GUI version & auto checkout ============================================ # ===== Resolve GUI version & auto checkout ============================================
# Rules: VERSION=""
# - If VERSION_ARG provided: try to checkout that tag (vX.Y.Z or X.Y.Z). If not found, ask which channel (Latest vs Pre-release),
# default to Latest, then fetch the chosen channel's latest tag and checkout.
# - If VERSION_ARG not provided: ask the channel first (default Latest), then checkout to that tag.
# - If not a git repo, warn and continue without switching (keep current branch).
VERSION="" # final GUI version string without 'v' prefix
choose_channel() { choose_channel() {
# Print menu to stderr first, then read from stdin; only echo the chosen token to stdout. # Print menu to stderr and read from /dev/tty so stdout only carries the token.
local ch="latest" sel="" local ch="latest" sel=""
if [[ -t 0 ]]; then if [[ -t 0 ]]; then
>&2 echo "[?] Choose v2rayN release channel:" echo "[?] Choose v2rayN release channel:" >&2
>&2 echo " 1) Latest (stable) [default]" echo " 1) Latest (stable) [default]" >&2
>&2 echo " 2) Pre-release (preview)" echo " 2) Pre-release (preview)" >&2
read -r -p "Enter 1 or 2 (default 1): " sel 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 case "${sel:-}" in
2) ch="prerelease" ;; 2) ch="prerelease" ;;
3) ch="keep" ;;
*) ch="latest" ;; *) ch="latest" ;;
esac esac
else else
ch="latest" ch="latest"
fi fi
else
ch="latest"
fi
echo "$ch" echo "$ch"
} }
get_latest_tag_latest() { get_latest_tag_latest() {
# Use GitHub API: /releases/latest → tag_name # Resolve /releases/latest → tag_name
curl -fsSL "https://api.github.com/repos/2dust/v2rayN/releases/latest" \ curl -fsSL "https://api.github.com/repos/2dust/v2rayN/releases/latest" \
| grep -Eo '"tag_name":\s*"v?[^"]+"' \ | grep -Eo '"tag_name":\s*"v?[^"]+"' \
| head -n1 \ | head -n1 \
@ -106,16 +179,34 @@ get_latest_tag_latest() {
} }
get_latest_tag_prerelease() { get_latest_tag_prerelease() {
# Use GitHub API: /releases?per_page=20 and pick the newest prerelease=true's tag_name # Resolve newest prerelease=true tag; prefer jq, fallback to sed/grep (no awk)
local json local json tag
json="$(curl -fsSL "https://api.github.com/repos/2dust/v2rayN/releases?per_page=20")" || return 1 json="$(curl -fsSL "https://api.github.com/repos/2dust/v2rayN/releases?per_page=20")" || return 1
echo "$json" \
| awk -v RS='},' '/"prerelease":[[:space:]]*true/ { if (match($0, /"tag_name":[[:space:]]*"v?[^"]+"/, m)) { t=m[0]; sub(/.*"tag_name":[[:space:]]*"?v?/, "", t); sub(/".*/, "", t); print t; exit } }' # 1) Use jq if present
if command -v jq >/dev/null 2>&1; then
tag="$(printf '%s' "$json" \
| jq -r '[.[] | select(.prerelease==true)][0].tag_name' 2>/dev/null \
| sed 's/^v//')" || true
fi
# 2) Fallback to sed/grep only
if [[ -z "${tag:-}" || "${tag:-}" == "null" ]]; then
tag="$(printf '%s' "$json" \
| tr '\n' ' ' \
| sed 's/},[[:space:]]*{/\n/g' \
| grep -m1 -E '"prerelease"[[:space:]]*:[[:space:]]*true' \
| grep -Eo '"tag_name"[[:space:]]*:[[:space:]]*"v?[^"]+"' \
| head -n1 \
| sed -E 's/.*"tag_name"[[:space:]]*:[[:space:]]*"v?([^"]+)".*/\1/')" || true
fi
[[ -n "${tag:-}" && "${tag:-}" != "null" ]] || return 1
printf '%s\n' "$tag"
} }
git_try_checkout() { git_try_checkout() {
# Try a series of refs and checkout when found. # Try a series of refs and checkout when found.
# Args: version-like string (may contain leading 'v')
local want="$1" ref="" local want="$1" 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
@ -147,10 +238,23 @@ if git rev-parse --git-dir >/dev/null 2>&1; then
else else
echo "[WARN] Tag '${VERSION_ARG}' not found." echo "[WARN] Tag '${VERSION_ARG}' not found."
ch="$(choose_channel)" ch="$(choose_channel)"
if [[ "$ch" == "keep" ]]; then
echo "[*] Keep current repository state (no checkout)."
if git describe --tags --abbrev=0 >/dev/null 2>&1; then
VERSION="$(git describe --tags --abbrev=0)"
else
VERSION="0.0.0+git"
fi
VERSION="${VERSION#v}"
else
echo "[*] Resolving ${ch} tag from GitHub releases..." echo "[*] Resolving ${ch} tag from GitHub releases..."
tag="" tag=""
if [[ "$ch" == "prerelease" ]]; then if [[ "$ch" == "prerelease" ]]; then
tag="$(get_latest_tag_prerelease || true)" tag="$(get_latest_tag_prerelease || true)"
if [[ -z "$tag" ]]; then
echo "[WARN] Failed to resolve prerelease tag, falling back to latest."
tag="$(get_latest_tag_latest || true)"
fi
else else
tag="$(get_latest_tag_latest || true)" tag="$(get_latest_tag_latest || true)"
fi fi
@ -159,13 +263,26 @@ if git rev-parse --git-dir >/dev/null 2>&1; then
git_try_checkout "$tag" || { echo "[ERROR] Failed to checkout '${tag}'."; exit 1; } git_try_checkout "$tag" || { echo "[ERROR] Failed to checkout '${tag}'."; exit 1; }
VERSION="${tag#v}" VERSION="${tag#v}"
fi fi
fi
else else
# No explicit GUI version passed: ask channel first
ch="$(choose_channel)" ch="$(choose_channel)"
if [[ "$ch" == "keep" ]]; then
echo "[*] Keep current repository state (no checkout)."
if git describe --tags --abbrev=0 >/dev/null 2>&1; then
VERSION="$(git describe --tags --abbrev=0)"
else
VERSION="0.0.0+git"
fi
VERSION="${VERSION#v}"
else
echo "[*] Resolving ${ch} tag from GitHub releases..." echo "[*] Resolving ${ch} tag from GitHub releases..."
tag="" tag=""
if [[ "$ch" == "prerelease" ]]; then if [[ "$ch" == "prerelease" ]]; then
tag="$(get_latest_tag_prerelease || true)" tag="$(get_latest_tag_prerelease || true)"
if [[ -z "$tag" ]]; then
echo "[WARN] Failed to resolve prerelease tag, falling back to latest."
tag="$(get_latest_tag_latest || true)"
fi
else else
tag="$(get_latest_tag_latest || true)" tag="$(get_latest_tag_latest || true)"
fi fi
@ -174,6 +291,7 @@ if git rev-parse --git-dir >/dev/null 2>&1; then
git_try_checkout "$tag" || { echo "[ERROR] Failed to checkout '${tag}'."; exit 1; } git_try_checkout "$tag" || { echo "[ERROR] Failed to checkout '${tag}'."; exit 1; }
VERSION="${tag#v}" VERSION="${tag#v}"
fi fi
fi
else else
echo "[WARN] Current directory is not a git repo; cannot checkout version. Proceeding on current tree." echo "[WARN] Current directory is not a git repo; cannot checkout version. Proceeding on current tree."
VERSION="${VERSION_ARG:-}" VERSION="${VERSION_ARG:-}"
@ -188,33 +306,44 @@ else
fi fi
echo "[*] GUI version resolved as: ${VERSION}" echo "[*] GUI version resolved as: ${VERSION}"
# ===== .NET publish (non-single file, self-contained) =========================================== # ===== .NET publish ===========================================================
# RID resolve: allow --arch override (x64|arm64)
rid=""
if [[ -n "$ARCH_OVERRIDE" ]]; then
case "$ARCH_OVERRIDE" in
x64|amd64) rid="linux-x64" ;;
arm64|aarch64) rid="linux-arm64" ;;
*) echo "[ERROR] Unknown --arch '$ARCH_OVERRIDE' (use x64|arm64)"; exit 1;;
esac
else
rid="$( [[ "$arch" == "aarch64" ]] && echo linux-arm64 || echo linux-x64 )"
fi
dotnet clean "$PROJECT" -c Release dotnet clean "$PROJECT" -c Release
rm -rf "$(dirname "$PROJECT")/bin/Release/net8.0" || true rm -rf "$(dirname "$PROJECT")/bin/Release/net8.0" || true
dotnet restore "$PROJECT" dotnet restore "$PROJECT"
dotnet publish "$PROJECT" \ dotnet publish "$PROJECT" \
-c Release -r "$( [[ "$arch" == "aarch64" ]] && echo linux-arm64 || echo linux-x64 )" \ -c Release -r "$rid" \
-p:PublishSingleFile=false \ -p:PublishSingleFile=false \
-p:SelfContained=true \ -p:SelfContained=true \
-p:IncludeNativeLibrariesForSelfExtract=true -p:IncludeNativeLibrariesForSelfExtract=true
RID_DIR="$( [[ "$arch" == "aarch64" ]] && echo linux-arm64 || echo linux-x64 )" RID_DIR="$rid"
PUBDIR="$(dirname "$PROJECT")/bin/Release/net8.0/${RID_DIR}/publish" PUBDIR="$(dirname "$PROJECT")/bin/Release/net8.0/${RID_DIR}/publish"
[[ -d "$PUBDIR" ]] [[ -d "$PUBDIR" ]]
# ===== Download Core（Optional） ======================================================== # ===== Helpers for core/rules download =======================================
download_xray() { download_xray() {
# Download Xray core and install to outdir/xray
local outdir="$1" ver="${XRAY_VER:-}" url tmp zipname="xray.zip" local outdir="$1" ver="${XRAY_VER:-}" url tmp zipname="xray.zip"
mkdir -p "$outdir" mkdir -p "$outdir"
if [[ -z "$ver" ]]; then if [[ -z "$ver" ]]; then
# Latest version
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_DIR" == "linux-arm64" ]]; then
if [[ "$arch" == "aarch64" ]]; then
url="https://github.com/XTLS/Xray-core/releases/download/v${ver}/Xray-linux-arm64-v8a.zip" url="https://github.com/XTLS/Xray-core/releases/download/v${ver}/Xray-linux-arm64-v8a.zip"
else else
url="https://github.com/XTLS/Xray-core/releases/download/v${ver}/Xray-linux-64.zip" url="https://github.com/XTLS/Xray-core/releases/download/v${ver}/Xray-linux-64.zip"
@ -227,6 +356,7 @@ download_xray() {
} }
download_singbox() { download_singbox() {
# Download sing-box core and install to outdir/sing-box
local outdir="$1" ver="${SING_VER:-}" url tmp tarname="singbox.tar.gz" bin local outdir="$1" ver="${SING_VER:-}" url tmp tarname="singbox.tar.gz" bin
mkdir -p "$outdir" mkdir -p "$outdir"
if [[ -z "$ver" ]]; then if [[ -z "$ver" ]]; then
@ -234,8 +364,7 @@ download_singbox() {
| 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 "[sing-box] Failed to get version"; return 1; } [[ -n "$ver" ]] || { echo "[sing-box] Failed to get version"; return 1; }
if [[ "$RID_DIR" == "linux-arm64" ]]; then
if [[ "$arch" == "aarch64" ]]; then
url="https://github.com/SagerNet/sing-box/releases/download/v${ver}/sing-box-${ver}-linux-arm64.tar.gz" url="https://github.com/SagerNet/sing-box/releases/download/v${ver}/sing-box-${ver}-linux-arm64.tar.gz"
else else
url="https://github.com/SagerNet/sing-box/releases/download/v${ver}/sing-box-${ver}-linux-amd64.tar.gz" url="https://github.com/SagerNet/sing-box/releases/download/v${ver}/sing-box-${ver}-linux-amd64.tar.gz"
@ -249,18 +378,32 @@ download_singbox() {
install -Dm755 "$bin" "$outdir/sing-box" install -Dm755 "$bin" "$outdir/sing-box"
} }
# === Geo rule download (ZIP-LIKE LAYOUT for netcore mode) ===================== # Move geo files to a unified path: outroot/bin/xray/
# Make netcore output match the ZIP bundle structure: unify_geo_layout() {
# - All geo databases at outroot/bin/ (geosite.dat, geoip.dat, Country.mmdb, geoip-only-cn-private.dat, geoip.metadb) local outroot="$1"
# - All *.srs rule-sets at outroot/bin/srss/ mkdir -p "$outroot/bin/xray"
# (Binaries stay under outroot/bin/xray and outroot/bin/sing_box as before.) local srcs=( \
"$outroot/bin/geosite.dat" \
"$outroot/bin/geoip.dat" \
"$outroot/bin/geoip-only-cn-private.dat" \
"$outroot/bin/Country.mmdb" \
"$outroot/bin/geoip.metadb" \
)
for s in "${srcs[@]}"; do
if [[ -f "$s" ]]; then
mv -f "$s" "$outroot/bin/xray/$(basename "$s")"
fi
done
}
# Download geo/rule assets; then unify to bin/xray/
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"
mkdir -p "$bin_dir" "$srss_dir" mkdir -p "$bin_dir" "$srss_dir"
echo "[+] Download Xray Geo (geosite/geoip/...) 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" \ curl -fsSL -o "$bin_dir/geoip.dat" \
@ -270,7 +413,7 @@ download_geo_assets() {
curl -fsSL -o "$bin_dir/Country.mmdb" \ curl -fsSL -o "$bin_dir/Country.mmdb" \
"https://raw.githubusercontent.com/Loyalsoldier/geoip/release/Country.mmdb" "https://raw.githubusercontent.com/Loyalsoldier/geoip/release/Country.mmdb"
echo "[+] Download sing-box rule DB & rule-sets to ZIP-like paths" 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" || true "https://github.com/MetaCubeX/meta-rules-dat/releases/latest/download/geoip.metadb" || true
@ -280,20 +423,22 @@ download_geo_assets() {
curl -fsSL -o "$srss_dir/$f" \ curl -fsSL -o "$srss_dir/$f" \
"https://raw.githubusercontent.com/2dust/sing-box-rules/rule-set-geoip/$f" || true "https://raw.githubusercontent.com/2dust/sing-box-rules/rule-set-geoip/$f" || true
done done
for f in \ for f in \
geosite-cn.srs geosite-gfw.srs geosite-greatfire.srs \ geosite-cn.srs geosite-gfw.srs geosite-greatfire.srs \
geosite-geolocation-cn.srs geosite-category-ads-all.srs geosite-private.srs; do geosite-geolocation-cn.srs geosite-category-ads-all.srs geosite-private.srs; do
curl -fsSL -o "$srss_dir/$f" \ curl -fsSL -o "$srss_dir/$f" \
"https://raw.githubusercontent.com/2dust/sing-box-rules/rule-set-geosite/$f" || true "https://raw.githubusercontent.com/2dust/sing-box-rules/rule-set-geosite/$f" || true
done done
# Unify to bin/xray/
unify_geo_layout "$outroot"
} }
# === NEW: Prefer the all-in-one v2rayN bundle zip first ======================= # Prefer the prebuilt v2rayN core bundle; then unify geo layout
download_v2rayn_bundle() { download_v2rayn_bundle() {
local outroot="$1" local outroot="$1"
local url="" local url=""
if [[ "$arch" == "aarch64" ]]; then if [[ "$RID_DIR" == "linux-arm64" ]]; then
url="https://raw.githubusercontent.com/2dust/v2rayN-core-bin/refs/heads/master/v2rayN-linux-arm64.zip" url="https://raw.githubusercontent.com/2dust/v2rayN-core-bin/refs/heads/master/v2rayN-linux-arm64.zip"
else else
url="https://raw.githubusercontent.com/2dust/v2rayN-core-bin/refs/heads/master/v2rayN-linux-64.zip" url="https://raw.githubusercontent.com/2dust/v2rayN-core-bin/refs/heads/master/v2rayN-linux-64.zip"
@ -304,7 +449,6 @@ download_v2rayn_bundle() {
curl -fL "$url" -o "$zipname" || { echo "[!] Bundle download failed"; return 1; } curl -fL "$url" -o "$zipname" || { echo "[!] Bundle download failed"; return 1; }
unzip -q "$zipname" -d "$tmp" || { echo "[!] Bundle unzip failed"; return 1; } unzip -q "$zipname" -d "$tmp" || { echo "[!] Bundle unzip failed"; return 1; }
# Normalize layout: copy 'bin/' if present; otherwise copy all
if [[ -d "$tmp/bin" ]]; then if [[ -d "$tmp/bin" ]]; then
mkdir -p "$outroot/bin" mkdir -p "$outroot/bin"
rsync -a "$tmp/bin/" "$outroot/bin/" rsync -a "$tmp/bin/" "$outroot/bin/"
@ -312,7 +456,6 @@ download_v2rayn_bundle() {
rsync -a "$tmp/" "$outroot/" rsync -a "$tmp/" "$outroot/"
fi fi
# --- CLEANUPS (keep bundle-only adjustments) -------------------------------
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
@ -323,32 +466,45 @@ download_v2rayn_bundle() {
rsync -a "$nested_dir/bin/" "$outroot/bin/" rsync -a "$nested_dir/bin/" "$outroot/bin/"
rm -rf "$nested_dir" rm -rf "$nested_dir"
fi fi
# ---------------------------------------------------------------------------
# Unify to bin/xray/
unify_geo_layout "$outroot"
echo "[+] Bundle extracted to $outroot" echo "[+] Bundle extracted to $outroot"
} }
# ===== Copy publish files to RPM build root ================================================== # ===== Copy publish files to RPM build root ====================================
rpmdev-setuptree
TOPDIR="${HOME}/rpmbuild"
SPECDIR="${TOPDIR}/SPECS"
SOURCEDIR="${TOPDIR}/SOURCES"
PKGROOT="v2rayN-publish" PKGROOT="v2rayN-publish"
WORKDIR="$(mktemp -d)" WORKDIR="$(mktemp -d)"
trap 'rm -rf "$WORKDIR"' EXIT trap 'rm -rf "$WORKDIR"' EXIT
if [[ "$ID" =~ ^(rhel|rocky|almalinux|centos)$ ]]; then
# --- RHEL path (UNCHANGED) ---
rpmdev-setuptree
TOPDIR="${HOME}/rpmbuild"
SPECDIR="${TOPDIR}/SPECS"
SOURCEDIR="${TOPDIR}/SOURCES"
USE_TOPDIR_DEFINE=0
else
# --- Ubuntu/Debian path (temporary _topdir) ---
TOPDIR="${WORKDIR}/rpmbuild"
SPECDIR="${TOPDIR}/SPECS"
SOURCEDIR="${TOPDIR}/SOURCES"
mkdir -p "${SPECDIR}" "${SOURCEDIR}" "${TOPDIR}/BUILD" "${TOPDIR}/RPMS" "${TOPDIR}/SRPMS"
USE_TOPDIR_DEFINE=1
fi
mkdir -p "$WORKDIR/$PKGROOT" mkdir -p "$WORKDIR/$PKGROOT"
cp -a "$PUBDIR/." "$WORKDIR/$PKGROOT/" cp -a "$PUBDIR/." "$WORKDIR/$PKGROOT/"
# icon（Optional） # Optional icon
ICON_CANDIDATE="$(dirname "$PROJECT")/../v2rayN.Desktop/v2rayN.png" ICON_CANDIDATE="$(dirname "$PROJECT")/../v2rayN.Desktop/v2rayN.png"
[[ -f "$ICON_CANDIDATE" ]] && cp "$ICON_CANDIDATE" "$WORKDIR/$PKGROOT/v2rayn.png" || true [[ -f "$ICON_CANDIDATE" ]] && cp "$ICON_CANDIDATE" "$WORKDIR/$PKGROOT/v2rayn.png" || true
# bin directory structure # Prepare bin structure
mkdir -p "$WORKDIR/$PKGROOT/bin/xray" "$WORKDIR/$PKGROOT/bin/sing_box" mkdir -p "$WORKDIR/$PKGROOT/bin/xray" "$WORKDIR/$PKGROOT/bin/sing_box"
# ====== NEW decision: prefer bundle zip unless --netcore, else fall back ====== # Prefer the bundle; fallback to separate core + rules
if [[ "$FORCE_NETCORE" -eq 0 ]]; then if [[ "$FORCE_NETCORE" -eq 0 ]]; then
if download_v2rayn_bundle "$WORKDIR/$PKGROOT"; then if download_v2rayn_bundle "$WORKDIR/$PKGROOT"; then
echo "[*] Using v2rayN bundle archive." echo "[*] Using v2rayN bundle archive."
@ -413,14 +569,14 @@ Geo files for Xray are placed at /opt/v2rayN/bin/xray; launcher will symlink the
install -dm0755 %{buildroot}/opt/v2rayN install -dm0755 %{buildroot}/opt/v2rayN
cp -a * %{buildroot}/opt/v2rayN/ cp -a * %{buildroot}/opt/v2rayN/
# Launcher (prioritize ELF first, then fall back to DLL; also create Geo symlinks for the user) # Launcher (prefer native ELF first, then DLL fallback; also create Geo symlinks for the user)
install -dm0755 %{buildroot}%{_bindir} install -dm0755 %{buildroot}%{_bindir}
cat > %{buildroot}%{_bindir}/v2rayn << 'EOF' cat > %{buildroot}%{_bindir}/v2rayn << 'EOF'
#!/usr/bin/bash #!/usr/bin/bash
set -euo pipefail set -euo pipefail
DIR="/opt/v2rayN" DIR="/opt/v2rayN"
# --- SYMLINK GEO into user's XDG dir (new) --- # --- Symlink GEO files into user's XDG dir (first-run convenience) ---
XDG_DATA_HOME="${XDG_DATA_HOME:-$HOME/.local/share}" XDG_DATA_HOME="${XDG_DATA_HOME:-$HOME/.local/share}"
USR_GEO_DIR="$XDG_DATA_HOME/v2rayN/bin" USR_GEO_DIR="$XDG_DATA_HOME/v2rayN/bin"
SYS_XRAY_DIR="$DIR/bin/xray" SYS_XRAY_DIR="$DIR/bin/xray"
@ -432,10 +588,10 @@ for f in geosite.dat geoip.dat geoip-only-cn-private.dat Country.mmdb; do
done done
# --- end GEO --- # --- end GEO ---
# Prefer native ELF（apphost） # Prefer native apphost
if [[ -x "$DIR/v2rayN" ]]; then exec "$DIR/v2rayN" "$@"; fi if [[ -x "$DIR/v2rayN" ]]; then exec "$DIR/v2rayN" "$@"; fi
# DLL fallback (for framework-dependent publish) # 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
@ -446,7 +602,7 @@ exit 1
EOF EOF
chmod 0755 %{buildroot}%{_bindir}/v2rayn chmod 0755 %{buildroot}%{_bindir}/v2rayn
# Desktop File # Desktop file
install -dm0755 %{buildroot}%{_datadir}/applications install -dm0755 %{buildroot}%{_datadir}/applications
cat > %{buildroot}%{_datadir}/applications/v2rayn.desktop << 'EOF' cat > %{buildroot}%{_datadir}/applications/v2rayn.desktop << 'EOF'
[Desktop Entry] [Desktop Entry]
@ -459,7 +615,7 @@ Terminal=false
Categories=Network; Categories=Network;
EOF EOF
# icon # Icon
if [ -f "%{_builddir}/__PKGROOT__/v2rayn.png" ]; then if [ -f "%{_builddir}/__PKGROOT__/v2rayn.png" ]; then
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
@ -480,32 +636,48 @@ fi
%{_datadir}/icons/hicolor/256x256/apps/v2rayn.png %{_datadir}/icons/hicolor/256x256/apps/v2rayn.png
SPEC SPEC
# Optional: system-wide autostart (append block, keep original logic unchanged) # ===== FIX: inline autostart into existing sections (avoid second %install/%files) ====
if [[ "$AUTOSTART" -eq 1 ]]; then if [[ "$AUTOSTART" -eq 1 ]]; then
cat >> "$SPECFILE" <<'SPEC' # Insert autostart creation commands into the existing %install section,
# System-wide autostart entry # right before %post (so still inside %install).
%install sed -i '/^%post/i \
install -dm0755 %{buildroot}/etc/xdg/autostart # --- Autostart (.desktop) ---\n\
cat > %{buildroot}/etc/xdg/autostart/v2rayn.desktop << 'EOF' install -dm0755 %{buildroot}/etc/xdg/autostart\n\
[Desktop Entry] cat > %{buildroot}/etc/xdg/autostart/v2rayn.desktop << '"'"'EOF'"'"'\n\
Type=Application [Desktop Entry]\n\
Name=v2rayN (Autostart) Type=Application\n\
Exec=v2rayn Name=v2rayN (Autostart)\n\
X-GNOME-Autostart-enabled=true Exec=v2rayn\n\
NoDisplay=false X-GNOME-Autostart-enabled=true\n\
EOF NoDisplay=false\n\
EOF\n' "$SPECFILE"
%files # Append the autostart file to the existing %files list.
%config(noreplace) /etc/xdg/autostart/v2rayn.desktop # We insert after the icon line to keep ordering tidy.
SPEC sed -i '0,|%{_datadir}/icons/hicolor/256x256/apps/v2rayn\.png|{
s|%{_datadir}/icons/hicolor/256x256/apps/v2rayn\.png|%{_datadir}/icons/hicolor/256x256/apps/v2rayn.png\
%config(noreplace) /etc/xdg/autostart/v2rayn.desktop|
}' "$SPECFILE"
fi fi
# Injecting version/package root placeholders # Inject 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 ================================================================ # ===== Build RPM ================================================================
if [[ "$USE_TOPDIR_DEFINE" -eq 1 ]]; then
rpmbuild -ba "$SPECFILE" --define "_topdir $TOPDIR"
else
rpmbuild -ba "$SPECFILE" rpmbuild -ba "$SPECFILE"
fi
# ===== Ubuntu/Debian: move temporary rpmbuild to ~/rpmbuild ====================
if [[ "$USE_TOPDIR_DEFINE" -eq 1 ]]; then
mkdir -p "$HOME/rpmbuild"
rsync -a "$TOPDIR"/ "$HOME/rpmbuild"/
TOPDIR="$HOME/rpmbuild"
fi
echo "Build done. RPM at:" echo "Build done. RPM at:"
ls -1 "${TOPDIR}/RPMS/$( [[ "$arch" == "aarch64" ]] && echo aarch64 || echo x86_64 )/v2rayN-${VERSION}-1"*.rpm archdir="$( [[ "$RID_DIR" == "linux-arm64" ]] && echo aarch64 || echo x86_64 )"
ls -1 "${TOPDIR}/RPMS/${archdir}/v2rayN-${VERSION}-1"*.rpm