package-rhel.sh

@@ -1,11 +1,11 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-# ====== Require Red Hat Enterprise Linux/FedoraLinux/RockyLinux/AlmaLinux/CentOS ======
+# == Require Red Hat Enterprise Linux/FedoraLinux/RockyLinux/AlmaLinux/CentOS OR Ubuntu/Debian ==
 if [[ -r /etc/os-release ]]; then
   . /etc/os-release
   case "$ID" in
-    rhel|rocky|almalinux|fedora|centos)
+    rhel|rocky|almalinux|fedora|centos|ubuntu|debian)
       echo "[OK] Detected supported system: $NAME $VERSION_ID"
       ;;
     *)
@@ -30,7 +30,7 @@ echo "[INFO] Detected kernel version: $KERNEL_FULL"
 
 if (( KERNEL_MAJOR < MIN_KERNEL_MAJOR )) || { (( KERNEL_MAJOR == MIN_KERNEL_MAJOR )) && (( KERNEL_MINOR < MIN_KERNEL_MINOR )); }; then
   echo "[ERROR] Kernel $KERNEL_FULL is too old. Requires Linux >= ${MIN_KERNEL_MAJOR}.${MIN_KERNEL_MINOR}."
-  echo "Please upgrade your system or use a newer container (e.g. Fedora 42+, RHEL 10+)."
+  echo "Please upgrade your system or use a newer container (e.g. Fedora 42+, RHEL 10+, Debian 13+)."
   exit 1
 fi
 
@@ -80,6 +80,7 @@ host_arch="$(uname -m)"
 
 install_ok=0
 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 || \
@@ -91,7 +92,58 @@ case "$ID" in
       install_ok=1
     fi
     ;;
-  *)
+  # ------------------------------ Ubuntu ----------------------------------------------
+  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
+    # Cross-arch binutils so strip matches target arch + objdump for brp scripts
+    sudo apt-get -y install binutils binutils-x86-64-linux-gnu binutils-aarch64-linux-gnu || 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) + objdump/strip
+    sudo apt-get -y install curl unzip tar rsync rpm binutils || 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 '[[ -n "${tmp:-}" ]] && 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
 
@@ -102,7 +154,7 @@ fi
 
 command -v curl >/dev/null
 
-# Root directory
+# Root directory = the script's location
 SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)"
 cd "$SCRIPT_DIR"
 
@@ -112,14 +164,14 @@ if [[ -f .gitmodules ]]; then
   git submodule update --init --recursive || true
 fi
 
-# Locate project
+# ===== 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; }
 
-# Resolve GUI version & auto checkout
+# ===== Resolve GUI version & auto checkout ============================================
 VERSION=""
 
 choose_channel() {
@@ -339,6 +391,22 @@ download_singbox() {
   install -Dm755 "$bin" "$outdir/sing-box"
 }
 
+# ---- NEW: download_mihomo (REQUIRED in --netcore mode) ----
+download_mihomo() {
+  # Download mihomo into outroot/bin/mihomo/mihomo
+  local outroot="$1"
+  local url=""
+  if [[ "$RID_DIR" == "linux-arm64" ]]; then
+    url="https://raw.githubusercontent.com/2dust/v2rayN-core-bin/refs/heads/master/v2rayN-linux-arm64/bin/mihomo/mihomo"
+  else
+    url="https://raw.githubusercontent.com/2dust/v2rayN-core-bin/refs/heads/master/v2rayN-linux-64/bin/mihomo/mihomo"
+  fi
+  echo "[+] Download mihomo: $url"
+  mkdir -p "$outroot/bin/mihomo"
+  curl -fL "$url" -o "$outroot/bin/mihomo/mihomo"
+  chmod +x "$outroot/bin/mihomo/mihomo" || true
+}
+
 # Move geo files to a unified path: outroot/bin
 unify_geo_layout() {
   local outroot="$1"
@@ -423,7 +491,8 @@ download_v2rayn_bundle() {
   fi
 
   rm -f "$outroot/v2rayn.zip" 2>/dev/null || true
-  find "$outroot" -type d -name "mihomo" -prune -exec rm -rf {} + 2>/dev/null || true
+  # keep mihomo
+  # 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)"
@@ -534,7 +603,7 @@ build_for_arch() {
     fi
     download_geo_assets "$WORKDIR/$PKGROOT" || echo "[!] Geo rules download failed (skipped)"
     # ---- REQUIRED: always fetch mihomo in netcore mode, per-arch ----
-    # download_mihomo "$WORKDIR/$PKGROOT" || echo "[!] mihomo download failed (skipped)"
+    download_mihomo "$WORKDIR/$PKGROOT" || echo "[!] mihomo download failed (skipped)"
   fi
 
   # Tarball

v2rayN/v2rayN/ViewModels/ThemeSettingViewModel.cs

@@ -1,7 +1,6 @@
 using MaterialDesignColors;
 using MaterialDesignColors.ColorManipulation;
 using MaterialDesignThemes.Wpf;
-using Microsoft.Win32;
 
 namespace v2rayN.ViewModels;
 
@@ -25,7 +24,7 @@ public class ThemeSettingViewModel : MyReactiveObject
     {
         _config = AppManager.Instance.Config;
 
-        RegisterSystemColorSet(_config, ModifyTheme);
+        RegisterSystemColorSet(_config, Application.Current.MainWindow, ModifyTheme);
 
         BindingUI();
         RestoreUI();
@@ -159,15 +158,25 @@ public class ThemeSettingViewModel : MyReactiveObject
         _paletteHelper.SetTheme(theme);
     }
 
-    public static void RegisterSystemColorSet(Config config, Action updateFunc)
+    public void RegisterSystemColorSet(Config config, Window window, Action updateFunc)
     {
-        SystemEvents.UserPreferenceChanged += (s, e) =>
+        var helper = new WindowInteropHelper(window);
+        var hwndSource = HwndSource.FromHwnd(helper.EnsureHandle());
+        hwndSource.AddHook((IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled) =>
         {
-            if ((e.Category == UserPreferenceCategory.Color || e.Category == UserPreferenceCategory.General)
-                && config.UiItem.CurrentTheme == nameof(ETheme.FollowSystem))
+            if (config.UiItem.CurrentTheme == nameof(ETheme.FollowSystem))
             {
-                updateFunc?.Invoke();
+                const int WM_SETTINGCHANGE = 0x001A;
+                if (msg == WM_SETTINGCHANGE)
+                {
+                    if (wParam == IntPtr.Zero && Marshal.PtrToStringUni(lParam) == "ImmersiveColorSet")
+                    {
+                        updateFunc?.Invoke();
+                    }
+                }
             }
-        };
+
+            return IntPtr.Zero;
+        });
     }
 }