Update package-rhel.sh

package-rhel.sh

@@ -23,6 +23,7 @@ fi
 VERSION_ARG="${1:-}"     # Pass version number like 7.13.8, or leave empty
 WITH_CORE="both"         # Default: bundle both xray+sing-box
 AUTOSTART=0              # 1 = enable system-wide autostart (/etc/xdg/autostart)
+FORCE_NETCORE=0          # --netcore => skip archive bundle, use separate downloads
 
 # If the first argument starts with --, don’t treat it as version number
 if [[ "${VERSION_ARG:-}" == --* ]]; then
@@ -38,6 +39,7 @@ while [[ $# -gt 0 ]]; do
     --autostart)     AUTOSTART=1; shift;;
     --xray-ver)      XRAY_VER="${2:-}"; shift 2;;        # Specify xray version (optional)
     --singbox-ver)   SING_VER="${2:-}"; shift 2;;        # Specify sing-box version (optional)
+    --netcore)       FORCE_NETCORE=1; shift;;            # NEW: force old mode (no bundle zip)
     *)
       if [[ -z "${VERSION_ARG:-}" ]]; then VERSION_ARG="$1"; fi
       shift;;
@@ -69,16 +71,122 @@ if [[ ! -f "$PROJECT" ]]; then
 fi
 [[ -f "$PROJECT" ]] || { echo "v2rayN.Desktop.csproj not found"; exit 1; }
 
-# Version
-VERSION="${VERSION_ARG:-}"
-if [[ -z "$VERSION" ]]; then
-  if git describe --tags --abbrev=0 >/dev/null 2>&1; then
-    VERSION="$(git describe --tags --abbrev=0)"
+# ===== Resolve GUI version & auto checkout ============================================
+# Rules:
+# - 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() {
+  # Print menu to stderr first, then read from stdin; only echo the chosen token to stdout.
+  local ch="latest" sel=""
+  if [[ -t 0 ]]; then
+    >&2 echo "[?] Choose v2rayN release channel:"
+    >&2 echo "    1) Latest (stable)  [default]"
+    >&2 echo "    2) Pre-release (preview)"
+    read -r -p "Enter 1 or 2 (default 1): " sel
+    case "${sel:-}" in
+      2) ch="prerelease" ;;
+      *) ch="latest" ;;
+    esac
   else
-    VERSION="0.0.0+git"
+    ch="latest"
   fi
+  echo "$ch"
+}
+
+get_latest_tag_latest() {
+  # Use GitHub API: /releases/latest → tag_name
+  curl -fsSL "https://api.github.com/repos/2dust/v2rayN/releases/latest" \
+    | grep -Eo '"tag_name":\s*"v?[^"]+"' \
+    | head -n1 \
+    | sed -E 's/.*"tag_name":\s*"v?([^"]+)".*/\1/'
+}
+
+get_latest_tag_prerelease() {
+  # Use GitHub API: /releases?per_page=20 and pick the newest prerelease=true's tag_name
+  local json
+  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 } }'
+}
+
+git_try_checkout() {
+  # Try a series of refs and checkout when found.
+  # Args: version-like string (may contain leading 'v')
+  local want="$1" ref=""
+  if git rev-parse --git-dir >/dev/null 2>&1; then
+    git fetch --tags --force --prune --depth=1 || true
+    if git rev-parse "refs/tags/v${want}" >/dev/null 2>&1; then
+      ref="v${want}"
+    elif git rev-parse "refs/tags/${want}" >/dev/null 2>&1; then
+      ref="${want}"
+    elif git rev-parse --verify "${want}" >/dev/null 2>&1; then
+      ref="${want}"
+    fi
+    if [[ -n "$ref" ]]; then
+      echo "[OK] Found ref '${ref}', checking out..."
+      git checkout -f "${ref}"
+      if [[ -f .gitmodules ]]; then
+        git submodule sync --recursive || true
+        git submodule update --init --recursive || true
+      fi
+      return 0
+    fi
+  fi
+  return 1
+}
+
+if git rev-parse --git-dir >/dev/null 2>&1; then
+  if [[ -n "${VERSION_ARG:-}" ]]; then
+    echo "[*] Trying to switch v2rayN repo to version: ${VERSION_ARG}"
+    if git_try_checkout "${VERSION_ARG#v}"; then
+      VERSION="${VERSION_ARG#v}"
+    else
+      echo "[WARN] Tag '${VERSION_ARG}' not found."
+      ch="$(choose_channel)"
+      echo "[*] Resolving ${ch} tag from GitHub releases..."
+      tag=""
+      if [[ "$ch" == "prerelease" ]]; then
+        tag="$(get_latest_tag_prerelease || true)"
+      else
+        tag="$(get_latest_tag_latest || true)"
+      fi
+      [[ -n "$tag" ]] || { echo "[ERROR] Failed to resolve latest tag for channel '${ch}'."; exit 1; }
+      echo "[*] Latest tag for '${ch}': ${tag}"
+      git_try_checkout "$tag" || { echo "[ERROR] Failed to checkout '${tag}'."; exit 1; }
+      VERSION="${tag#v}"
+    fi
+  else
+    # No explicit GUI version passed: ask channel first
+    ch="$(choose_channel)"
+    echo "[*] Resolving ${ch} tag from GitHub releases..."
+    tag=""
+    if [[ "$ch" == "prerelease" ]]; then
+      tag="$(get_latest_tag_prerelease || true)"
+    else
+      tag="$(get_latest_tag_latest || true)"
+    fi
+    [[ -n "$tag" ]] || { echo "[ERROR] Failed to resolve latest tag for channel '${ch}'."; exit 1; }
+    echo "[*] Latest tag for '${ch}': ${tag}"
+    git_try_checkout "$tag" || { echo "[ERROR] Failed to checkout '${tag}'."; exit 1; }
+    VERSION="${tag#v}"
+  fi
+else
+  echo "[WARN] Current directory is not a git repo; cannot checkout version. Proceeding on current tree."
+  VERSION="${VERSION_ARG:-}"
+  if [[ -z "$VERSION" ]]; then
+    if git describe --tags --abbrev=0 >/dev/null 2>&1; then
+      VERSION="$(git describe --tags --abbrev=0)"
+    else
+      VERSION="0.0.0+git"
+    fi
+  fi
+  VERSION="${VERSION#v}"
 fi
-VERSION="${VERSION#v}"   # Remove the prefix "v"
+echo "[*] GUI version resolved as: ${VERSION}"
 
 # ===== .NET publish (non-single file, self-contained) ===========================================
 dotnet clean "$PROJECT" -c Release
@@ -141,44 +249,85 @@ download_singbox() {
   install -Dm755 "$bin" "$outdir/sing-box"
 }
 
-# === Geo rule download (new logic) ===================================
+# === Geo rule download (ZIP-LIKE LAYOUT for netcore mode) =====================
+# Make netcore output match the ZIP bundle structure:
+# - All geo databases at    outroot/bin/ (geosite.dat, geoip.dat, Country.mmdb, geoip-only-cn-private.dat, geoip.metadb)
+# - All *.srs rule-sets at  outroot/bin/srss/
+# (Binaries stay under outroot/bin/xray and outroot/bin/sing_box as before.)
 download_geo_assets() {
   local outroot="$1"
-  local xray_dir="$outroot/bin/xray"
-  local sbox_dir="$outroot/bin/sing_box"
-  mkdir -p "$xray_dir" "$sbox_dir/rule-sets"
+  local bin_dir="$outroot/bin"
+  local srss_dir="$bin_dir/srss"
+  mkdir -p "$bin_dir" "$srss_dir"
 
-  echo "[+] Download Xray Geo（geosite/geoip/...）"
-  curl -fsSL -o "$xray_dir/geosite.dat" \
+  echo "[+] Download Xray Geo (geosite/geoip/...) 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 "$xray_dir/geoip.dat" \
+  curl -fsSL -o "$bin_dir/geoip.dat" \
     "https://github.com/Loyalsoldier/V2ray-rules-dat/releases/latest/download/geoip.dat"
-  curl -fsSL -o "$xray_dir/geoip-only-cn-private.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 "$xray_dir/Country.mmdb" \
+  curl -fsSL -o "$bin_dir/Country.mmdb" \
     "https://raw.githubusercontent.com/Loyalsoldier/geoip/release/Country.mmdb"
 
-  echo "[+] Download sing-box rules & DB"
-  # database (optional meta rules)
-  curl -fsSL -o "$sbox_dir/geoip.metadb" \
+  echo "[+] Download sing-box rule DB & rule-sets to ZIP-like paths"
+  curl -fsSL -o "$bin_dir/geoip.metadb" \
     "https://github.com/MetaCubeX/meta-rules-dat/releases/latest/download/geoip.metadb" || true
 
-  # Official 2dust srs rule-sets (common subsets)
   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 "$sbox_dir/rule-sets/$f" \
+    curl -fsSL -o "$srss_dir/$f" \
       "https://raw.githubusercontent.com/2dust/sing-box-rules/rule-set-geoip/$f" || true
   done
 
   for f in \
     geosite-cn.srs geosite-gfw.srs geosite-greatfire.srs \
-    geosite-geolocation-cn.srs geosite-category-ads-all.srs; do
-    curl -fsSL -o "$sbox_dir/rule-sets/$f" \
+    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
 }
 
+# === NEW: Prefer the all-in-one v2rayN bundle zip first =======================
+download_v2rayn_bundle() {
+  local outroot="$1"
+  local url=""
+  if [[ "$arch" == "aarch64" ]]; then
+    url="https://raw.githubusercontent.com/2dust/v2rayN-core-bin/refs/heads/master/v2rayN-linux-arm64.zip"
+  else
+    url="https://raw.githubusercontent.com/2dust/v2rayN-core-bin/refs/heads/master/v2rayN-linux-64.zip"
+  fi
+  echo "[+] Try v2rayN bundle archive: $url"
+  local tmp zipname
+  tmp="$(mktemp -d)"; zipname="$tmp/v2rayn.zip"
+  curl -fL "$url" -o "$zipname" || { echo "[!] Bundle download 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
+    mkdir -p "$outroot/bin"
+    rsync -a "$tmp/bin/" "$outroot/bin/"
+  else
+    rsync -a "$tmp/" "$outroot/"
+  fi
+
+  # --- CLEANUPS (keep bundle-only adjustments) -------------------------------
+  rm -f "$outroot/v2rayn.zip" 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)"
+  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
+  # ---------------------------------------------------------------------------
+
+  echo "[+] Bundle extracted to $outroot"
+}
+
 # ===== Copy publish files to RPM build root ==================================================
 rpmdev-setuptree
 TOPDIR="${HOME}/rpmbuild"
@@ -199,16 +348,30 @@ ICON_CANDIDATE="$(dirname "$PROJECT")/../v2rayN.Desktop/v2rayN.png"
 # bin directory structure
 mkdir -p "$WORKDIR/$PKGROOT/bin/xray" "$WORKDIR/$PKGROOT/bin/sing_box"
 
-# Core
-if [[ "$WITH_CORE" == "xray" || "$WITH_CORE" == "both" ]]; then
-  download_xray "$WORKDIR/$PKGROOT/bin/xray" || echo "[!] xray download failed (skipped)）"
+# ====== NEW decision: prefer bundle zip unless --netcore, else fall back ======
+if [[ "$FORCE_NETCORE" -eq 0 ]]; then
+  if download_v2rayn_bundle "$WORKDIR/$PKGROOT"; then
+    echo "[*] Using v2rayN bundle archive."
+  else
+    echo "[*] Bundle failed, fallback to separate core + rules."
+    if [[ "$WITH_CORE" == "xray" || "$WITH_CORE" == "both" ]]; then
+      download_xray "$WORKDIR/$PKGROOT/bin/xray" || echo "[!] xray download failed (skipped)"
+    fi
+    if [[ "$WITH_CORE" == "sing-box" || "$WITH_CORE" == "both" ]]; then
+      download_singbox "$WORKDIR/$PKGROOT/bin/sing_box" || echo "[!] sing-box download failed (skipped)"
+    fi
+    download_geo_assets "$WORKDIR/$PKGROOT" || echo "[!] Geo rules download failed (skipped)"
+  fi
+else
+  echo "[*] --netcore specified: use separate core + rules."
+  if [[ "$WITH_CORE" == "xray" || "$WITH_CORE" == "both" ]]; then
+    download_xray "$WORKDIR/$PKGROOT/bin/xray" || echo "[!] xray download failed (skipped)"
+  fi
+  if [[ "$WITH_CORE" == "sing-box" || "$WITH_CORE" == "both" ]]; then
+    download_singbox "$WORKDIR/$PKGROOT/bin/sing_box" || echo "[!] sing-box download failed (skipped)"
+  fi
+  download_geo_assets "$WORKDIR/$PKGROOT" || echo "[!] Geo rules download failed (skipped)"
 fi
-if [[ "$WITH_CORE" == "sing-box" || "$WITH_CORE" == "both" ]]; then
-  download_singbox "$WORKDIR/$PKGROOT/bin/sing_box" || echo "[!] sing-box download failed (skipped)"
-fi
-
-# Geo / rule-sets
-download_geo_assets "$WORKDIR/$PKGROOT" || echo "[!] Geo rules download failed (skipped)"
 
 tar -C "$WORKDIR" -czf "$SOURCEDIR/$PKGROOT.tar.gz" "$PKGROOT"
 
@@ -303,12 +466,12 @@ if [ -f "%{_builddir}/__PKGROOT__/v2rayn.png" ]; then
 fi
 
 %post
-/usr/bin/update-desktop-database %{_datadir}/applications >/dev/null 2&> /dev/null || true
-/usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/hicolor >/dev/null 2&> /dev/null || true
+/usr/bin/update-desktop-database %{_datadir}/applications >/dev/null 2>&1 || true
+/usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/hicolor >/dev/null 2>&1 || true
 
 %postun
-/usr/bin/update-desktop-database %{_datadir}/applications >/dev/null 2&> /dev/null || true
-/usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/hicolor >/dev/null 2&> /dev/null || true
+/usr/bin/update-desktop-database %{_datadir}/applications >/dev/null 2>&1 || true
+/usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/hicolor >/dev/null 2>&1 || true
 
 %files
 %{_bindir}/v2rayn