Remove -Program parameter from windows firewall rule (#739)

- Change tag pattern in release workflow to 'v*'
- Update description

.github/workflows/release.yml

@@ -3,7 +3,7 @@ name: Make release and binaries
 on:
   push:
     tags:
-      - '*'
+      - 'v*'
 
 permissions:
   contents: write

beszel/.goreleaser.yml

@@ -29,6 +29,7 @@ builds:
       - linux
       - darwin
       - freebsd
+      - openbsd
       - windows
     goarch:
       - amd64
@@ -39,6 +40,8 @@ builds:
     ignore:
       - goos: freebsd
         goarch: arm
+      - goos: openbsd
+        goarch: arm
       - goos: windows
         goarch: arm
       - goos: darwin
@@ -47,7 +50,7 @@ builds:
         goarch: riscv64
 
 archives:
-  - id: beszel
+  - id: beszel-agent
     format: tar.gz
     builds:
       - beszel-agent
@@ -59,7 +62,7 @@ archives:
       - goos: windows
         format: zip
 
-  - id: beszel-agent
+  - id: beszel
     format: tar.gz
     builds:
       - beszel
@@ -111,6 +114,65 @@ nfpms:
         # https://github.com/goreleaser/goreleaser/issues/5487
         #config: ../supplemental/debian/config.sh
 
+scoops:
+  - ids: [beszel-agent]
+    name: beszel-agent
+    repository:
+      owner: henrygd
+      name: beszel-scoops
+    homepage: 'https://beszel.dev'
+    description: 'Agent for Beszel, a lightweight server monitoring platform.'
+    license: MIT
+
+# # Needs choco installed, so doesn't build on linux / default gh workflow :(
+# chocolateys:
+#   - title: Beszel Agent
+#     ids: [beszel-agent]
+#     package_source_url: https://github.com/henrygd/beszel-chocolatey
+#     owners: henrygd
+#     authors: henrygd
+#     summary: 'Agent for Beszel, a lightweight server monitoring platform.'
+#     description: |
+#       Beszel is a lightweight server monitoring platform that includes Docker statistics, historical data, and alert functions.
+
+#       It has a friendly web interface, simple configuration, and is ready to use out of the box. It supports automatic backup, multi-user, OAuth authentication, and API access.
+#     license_url: https://github.com/henrygd/beszel/blob/main/LICENSE
+#     project_url: https://beszel.dev
+#     project_source_url: https://github.com/henrygd/beszel
+#     docs_url: https://beszel.dev/guide/getting-started
+#     icon_url: https://cdn.jsdelivr.net/gh/selfhst/icons/png/beszel.png
+#     bug_tracker_url: https://github.com/henrygd/beszel/issues
+#     copyright: 2025 henrygd
+#     tags: foss cross-platform admin monitoring
+#     require_license_acceptance: false
+#     release_notes: 'https://github.com/henrygd/beszel/releases/tag/v{{ .Version }}'
+
+brews:
+  - ids: [beszel-agent]
+    name: beszel-agent
+    repository:
+      owner: henrygd
+      name: homebrew-beszel
+    homepage: 'https://beszel.dev'
+    description: 'Agent for Beszel, a lightweight server monitoring platform.'
+    license: MIT
+    extra_install: |
+      (bin/"beszel-agent-launcher").write <<~EOS
+        #!/bin/bash
+        set -a
+        if [ -f "$HOME/.config/beszel/beszel-agent.env" ]; then
+          source "$HOME/.config/beszel/beszel-agent.env"
+        fi
+        set +a
+        exec #{bin}/beszel-agent "$@"
+      EOS
+      (bin/"beszel-agent-launcher").chmod 0755
+    service: |
+      run ["#{bin}/beszel-agent-launcher"]
+      log_path "#{Dir.home}/.cache/beszel/beszel-agent.log"
+      error_log_path "#{Dir.home}/.cache/beszel/beszel-agent.log"
+      keep_alive true
+
 release:
   draft: true
 

beszel/internal/agent/disk.go

@@ -5,6 +5,7 @@ import (
 	"log/slog"
 	"os"
 	"path/filepath"
+	"runtime"
 	"strings"
 	"time"
 
@@ -36,7 +37,12 @@ func (a *Agent) initializeDiskInfo() {
 
 	// Helper function to add a filesystem to fsStats if it doesn't exist
 	addFsStat := func(device, mountpoint string, root bool) {
-		key := filepath.Base(device)
+		var key string
+		if runtime.GOOS == "windows" {
+			key = device
+		} else {
+			key = filepath.Base(device)
+		}
 		var ioMatch bool
 		if _, exists := a.fsStats[key]; !exists {
 			if root {

beszel/internal/agent/gpu.go

@@ -125,14 +125,13 @@ func (gm *GPUManager) getJetsonParser() func(output []byte) bool {
 	// TODO: Maybe use VDD_IN for Nano / NX and add a total system power chart
 	powerPattern := regexp.MustCompile(`(GPU_SOC|CPU_GPU_CV) (\d+)mW`)
 
+	// jetson devices have only one gpu so we'll just initialize here
+	gpuData := &system.GPUData{Name: "GPU"}
+	gm.GpuDataMap["0"] = gpuData
+
 	return func(output []byte) bool {
 		gm.Lock()
 		defer gm.Unlock()
-		// we get gpu name from the intitial run of nvidia-smi, so return if it hasn't been initialized
-		gpuData, ok := gm.GpuDataMap["0"]
-		if !ok {
-			return true
-		}
 		// Parse RAM usage
 		ramMatches := ramPattern.FindSubmatch(output)
 		if ramMatches != nil {
@@ -184,12 +183,6 @@ func (gm *GPUManager) parseNvidiaData(output []byte) bool {
 		if _, ok := gm.GpuDataMap[id]; !ok {
 			name := strings.TrimPrefix(fields[1], "NVIDIA ")
 			gm.GpuDataMap[id] = &system.GPUData{Name: strings.TrimSuffix(name, " Laptop GPU")}
-			// check if tegrastats is active - if so we will only use nvidia-smi to get gpu name
-			// - nvidia-smi does not provide metrics for tegra / jetson devices
-			// this will end the nvidia-smi collector
-			if gm.tegrastats {
-				return false
-			}
 		}
 		// update gpu data
 		gpu := gm.GpuDataMap[id]
@@ -283,6 +276,7 @@ func (gm *GPUManager) detectGPUs() error {
 	}
 	if _, err := exec.LookPath(tegraStatsCmd); err == nil {
 		gm.tegrastats = true
+		gm.nvidiaSmi = false
 	}
 	if gm.nvidiaSmi || gm.rocmSmi || gm.tegrastats {
 		return nil
@@ -297,9 +291,11 @@ func (gm *GPUManager) startCollector(command string) {
 	}
 	switch command {
 	case nvidiaSmiCmd:
-		collector.cmdArgs = []string{"-l", nvidiaSmiInterval,
+		collector.cmdArgs = []string{
+			"-l", nvidiaSmiInterval,
 			"--query-gpu=index,name,temperature.gpu,memory.used,memory.total,utilization.gpu,power.draw",
-			"--format=csv,noheader,nounits"}
+			"--format=csv,noheader,nounits",
+		}
 		collector.parse = gm.parseNvidiaData
 		go collector.start()
 	case tegraStatsCmd:

beszel/internal/agent/gpu_test.go

@@ -251,14 +251,13 @@ func TestParseJetsonData(t *testing.T) {
 	tests := []struct {
 		name        string
 		input       string
-		gm          *GPUManager
 		wantMetrics *system.GPUData
 	}{
 		{
 			name:  "valid data",
 			input: "11-14-2024 22:54:33 RAM 4300/30698MB GR3D_FREQ 45% tj@52.468C VDD_GPU_SOC 2171mW",
 			wantMetrics: &system.GPUData{
-				Name:        "Jetson",
+				Name:        "GPU",
 				MemoryUsed:  4300.0,
 				MemoryTotal: 30698.0,
 				Usage:       45.0,
@@ -271,7 +270,7 @@ func TestParseJetsonData(t *testing.T) {
 			name:  "more valid data",
 			input: "11-15-2024 08:38:09 RAM 6185/7620MB (lfb 8x2MB) SWAP 851/3810MB (cached 1MB) CPU [15%@729,11%@729,14%@729,13%@729,11%@729,8%@729] EMC_FREQ 43%@2133 GR3D_FREQ 63%@[621] NVDEC off NVJPG off NVJPG1 off VIC off OFA off APE 200 cpu@53.968C soc2@52.437C soc0@50.75C gpu@53.343C tj@53.968C soc1@51.656C VDD_IN 12479mW/12479mW VDD_CPU_GPU_CV 4667mW/4667mW VDD_SOC 2817mW/2817mW",
 			wantMetrics: &system.GPUData{
-				Name:        "Jetson",
+				Name:        "GPU",
 				MemoryUsed:  6185.0,
 				MemoryTotal: 7620.0,
 				Usage:       63.0,
@@ -284,7 +283,7 @@ func TestParseJetsonData(t *testing.T) {
 			name:  "missing temperature",
 			input: "11-14-2024 22:54:33 RAM 4300/30698MB GR3D_FREQ 45% VDD_GPU_SOC 2171mW",
 			wantMetrics: &system.GPUData{
-				Name:        "Jetson",
+				Name:        "GPU",
 				MemoryUsed:  4300.0,
 				MemoryTotal: 30698.0,
 				Usage:       45.0,
@@ -292,32 +291,18 @@ func TestParseJetsonData(t *testing.T) {
 				Count:       1,
 			},
 		},
-		{
-			name:  "no gpu defined by nvidia-smi",
-			input: "11-14-2024 22:54:33 RAM 4300/30698MB GR3D_FREQ 45% VDD_GPU_SOC 2171mW",
-			gm: &GPUManager{
-				GpuDataMap: map[string]*system.GPUData{},
-			},
-		},
 	}
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			if tt.gm != nil {
-				// should return if no gpu set by nvidia-smi
-				assert.Empty(t, tt.gm.GpuDataMap)
-				return
+			gm := &GPUManager{
+				GpuDataMap: make(map[string]*system.GPUData),
 			}
-			tt.gm = &GPUManager{
-				GpuDataMap: map[string]*system.GPUData{
-					"0": {Name: "Jetson"},
-				},
-			}
-			parser := tt.gm.getJetsonParser()
+			parser := gm.getJetsonParser()
 			valid := parser([]byte(tt.input))
 			assert.Equal(t, true, valid)
 
-			got := tt.gm.GpuDataMap["0"]
+			got := gm.GpuDataMap["0"]
 			require.NotNil(t, got)
 			assert.Equal(t, tt.wantMetrics.Name, got.Name)
 			assert.InDelta(t, tt.wantMetrics.MemoryUsed, got.MemoryUsed, 0.01)
@@ -443,7 +428,7 @@ echo "test"`
 				}
 				return nil
 			},
-			wantNvidiaSmi:  true,
+			wantNvidiaSmi:  false,
 			wantRocmSmi:    true,
 			wantTegrastats: true,
 			wantErr:        false,

beszel/site/src/components/command-palette.tsx

@@ -22,7 +22,7 @@ import {
 import { memo, useEffect, useMemo } from "react"
 import { $systems } from "@/lib/stores"
 import { getHostDisplayValue, isAdmin, listen } from "@/lib/utils"
-import { $router, basePath, navigate } from "./router"
+import { $router, basePath, navigate, prependBasePath } from "./router"
 import { Trans } from "@lingui/react/macro"
 import { t } from "@lingui/core/macro"
 import { getPagePath } from "@nanostores/router"
@@ -133,7 +133,7 @@ export default memo(function CommandPalette({ open, setOpen }: { open: boolean;
 									keywords={["pocketbase"]}
 									onSelect={() => {
 										setOpen(false)
-										window.open("/_/", "_blank")
+										window.open(prependBasePath("/_/"), "_blank")
 									}}
 								>
 									<UsersIcon className="me-2 h-4 w-4" />
@@ -147,7 +147,7 @@ export default memo(function CommandPalette({ open, setOpen }: { open: boolean;
 								<CommandItem
 									onSelect={() => {
 										setOpen(false)
-										window.open("/_/#/logs", "_blank")
+										window.open(prependBasePath("/_/#/logs"), "_blank")
 									}}
 								>
 									<LogsIcon className="me-2 h-4 w-4" />
@@ -161,7 +161,7 @@ export default memo(function CommandPalette({ open, setOpen }: { open: boolean;
 								<CommandItem
 									onSelect={() => {
 										setOpen(false)
-										window.open("/_/#/settings/backups", "_blank")
+										window.open(prependBasePath("/_/#/settings/backups"), "_blank")
 									}}
 								>
 									<DatabaseBackupIcon className="me-2 h-4 w-4" />
@@ -176,7 +176,7 @@ export default memo(function CommandPalette({ open, setOpen }: { open: boolean;
 									keywords={["email"]}
 									onSelect={() => {
 										setOpen(false)
-										window.open("/_/#/settings/mail", "_blank")
+										window.open(prependBasePath("/_/#/settings/mail"), "_blank")
 									}}
 								>
 									<MailIcon className="me-2 h-4 w-4" />

beszel/site/src/components/routes/system.tsx

@@ -22,7 +22,7 @@ import { Separator } from "../ui/separator"
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "../ui/tooltip"
 import { Button } from "../ui/button"
 import { Input } from "../ui/input"
-import { ChartAverage, ChartMax, Rows, TuxIcon } from "../ui/icons"
+import { ChartAverage, ChartMax, Rows, TuxIcon, WindowsIcon } from "../ui/icons"
 import { useIntersectionObserver } from "@/lib/use-intersection-observer"
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "../ui/select"
 import { timeTicks } from "d3-time"
@@ -251,6 +251,12 @@ export default function SystemDetail({ name }: { name: string }) {
 		if (!system.info) {
 			return []
 		}
+		let version = system.info.k ?? ""
+		const buildIndex = version.indexOf(" Build")
+		const isWindows = buildIndex !== -1
+		if (isWindows) {
+			version = version.substring(0, buildIndex)
+		}
 		let uptime: React.ReactNode
 		if (system.info.u < 172800) {
 			const hours = Math.trunc(system.info.u / 3600)
@@ -268,7 +274,11 @@ export default function SystemDetail({ name }: { name: string }) {
 				hide: system.info.h === system.host || system.info.h === system.name,
 			},
 			{ value: uptime, Icon: ClockArrowUp, label: t`Uptime`, hide: !system.info.u },
-			{ value: system.info.k, Icon: TuxIcon, label: t({ comment: "Linux kernel", message: "Kernel" }) },
+			{
+				value: version,
+				Icon: isWindows ? WindowsIcon : TuxIcon,
+				label: isWindows ? t`Windows build` : t({ comment: "Linux kernel", message: "Kernel" }),
+			},
 			{
 				value: `${system.info.m} (${system.info.c}c${system.info.t ? `/${system.info.t}t` : ""})`,
 				Icon: CpuIcon,

beszel/site/src/components/ui/icons.tsx

@@ -12,6 +12,21 @@ export function TuxIcon(props: SVGProps<SVGSVGElement>) {
 	)
 }
 
+// meteor icons (MIT) https://github.com/zkreations/icons/blob/main/LICENSE
+export function WindowsIcon(props: SVGProps<SVGSVGElement>) {
+	return (
+		<svg viewBox="0 0 24 24" {...props}>
+			<path
+				fill="none"
+				stroke="currentColor"
+				strokeLinejoin="round"
+				strokeWidth="2"
+				d="M2 12h20m-11.3 8.3V3.7M2 5l20-3v20L2 19Z"
+			/>
+		</svg>
+	)
+}
+
 // MingCute Apache License 2.0 https://github.com/Richard9394/MingCute
 export function Rows(props: SVGProps<SVGSVGElement>) {
 	return (

supplemental/scripts/install-agent-brew.sh

@@ -0,0 +1,70 @@
+#!/bin/bash
+
+PORT=45876
+KEY=""
+
+usage() {
+  printf "Beszel Agent homebrew installation script\n\n"
+  printf "Usage: ./install-agent-brew.sh [options]\n\n"
+  printf "Options: \n"
+  printf "  -k            SSH key (required, or interactive if not provided)\n"
+  printf "  -p            Port (default: $PORT)\n"
+  printf "  -h, --help    Display this help message\n"
+  exit 0
+}
+
+# Handle --help explicitly since getopts doesn't handle long options
+if [ "$1" = "--help" ]; then
+  usage
+fi
+
+# Parse arguments with getopts
+while getopts "k:p:h" opt; do
+  case ${opt} in
+  k)
+    KEY="$OPTARG"
+    ;;
+  p)
+    PORT="$OPTARG"
+    ;;
+  h)
+    usage
+    ;;
+  \?)
+    echo "Invalid option: -$OPTARG" >&2
+    usage
+    ;;
+  :)
+    echo "Option -$OPTARG requires an argument." >&2
+    usage
+    ;;
+  esac
+done
+
+# Exit if brew is not installed
+if ! command -v brew &>/dev/null; then
+  echo "Homebrew is not installed. Please install Homebrew and try again."
+  exit 1
+fi
+
+if [ -z "$KEY" ]; then
+  read -p "Enter SSH key: " KEY
+fi
+
+mkdir -p ~/.config/beszel ~/.cache/beszel
+
+echo "KEY=\"$KEY\"" >~/.config/beszel/beszel-agent.env
+echo "PORT=$PORT" >>~/.config/beszel/beszel-agent.env
+
+brew tap henrygd/beszel
+brew install beszel-agent
+brew services start beszel-agent
+
+printf "\nCheck status: brew services info beszel-agent\n"
+echo "Stop: brew services stop beszel-agent"
+echo "Start: brew services start beszel-agent"
+echo "Restart: brew services restart beszel-agent"
+echo "Upgrade: brew upgrade beszel-agent"
+echo "Uninstall: brew uninstall beszel-agent"
+echo "View logs in ~/.cache/beszel/beszel-agent.log"
+echo "Change environment variables in ~/.config/beszel/beszel-agent.env"

supplemental/scripts/install-agent.ps1

@@ -0,0 +1,184 @@
+param (
+    [switch]$Elevated,
+    [Parameter(Mandatory=$true)]
+    [string]$Key,
+    [int]$Port = 45876
+)
+
+# Check if key is provided or empty
+if ([string]::IsNullOrWhiteSpace($Key)) {
+    Write-Host "ERROR: SSH Key is required." -ForegroundColor Red
+    Write-Host "Usage: .\install-agent.ps1 -Key 'your-ssh-key-here' [-Port port-number]" -ForegroundColor Yellow
+    exit 1
+}
+
+# Stop on first error
+$ErrorActionPreference = "Stop"
+
+# Function to check if running as admin
+function Test-Admin {
+    return ([Security.Principal.WindowsPrincipal] [Security.Principal.WindowsIdentity]::GetCurrent()).IsInRole([Security.Principal.WindowsBuiltInRole]::Administrator)
+}
+
+# Non-admin tasks - install Scoop and Scoop apps - Only run if we're not in elevated mode
+if (-not $Elevated) {
+    try {
+        # Check if Scoop is already installed
+        if (Get-Command scoop -ErrorAction SilentlyContinue) {
+            Write-Host "Scoop is already installed."
+        } else {
+            Write-Host "Installing Scoop..."
+            Invoke-RestMethod -Uri https://get.scoop.sh | Invoke-Expression
+            
+            if (-not (Get-Command scoop -ErrorAction SilentlyContinue)) {
+                throw "Failed to install Scoop"
+            }
+        }
+
+        # Check if git is already installed
+        if (Get-Command git -ErrorAction SilentlyContinue) {
+            Write-Host "Git is already installed."
+        } else {
+            Write-Host "Installing Git..."
+            scoop install git
+            
+            if (-not (Get-Command git -ErrorAction SilentlyContinue)) {
+                throw "Failed to install Git"
+            }
+        }
+
+        # Check if nssm is already installed
+        if (Get-Command nssm -ErrorAction SilentlyContinue) {
+            Write-Host "NSSM is already installed."
+        } else {
+            Write-Host "Installing NSSM..."
+            scoop install nssm
+            
+            if (-not (Get-Command nssm -ErrorAction SilentlyContinue)) {
+                throw "Failed to install NSSM"
+            }
+        }
+        
+        # Add bucket and install agent
+        Write-Host "Adding beszel bucket..."
+        scoop bucket add beszel https://github.com/henrygd/beszel-scoops
+        
+        Write-Host "Installing beszel-agent..."
+        scoop install beszel-agent
+        
+        if (-not (Get-Command beszel-agent -ErrorAction SilentlyContinue)) {
+            throw "Failed to install beszel-agent"
+        }
+    }
+    catch {
+        Write-Host "ERROR: $($_.Exception.Message)" -ForegroundColor Red
+        Write-Host "Installation failed. Please check the error message above." -ForegroundColor Red
+        Write-Host "Press any key to exit..." -ForegroundColor Red
+        $null = $Host.UI.RawUI.ReadKey("NoEcho,IncludeKeyDown")
+        exit 1
+    }
+
+    # Check if we need admin privileges for the NSSM part
+    if (-not (Test-Admin)) {
+        Write-Host "Admin privileges required for NSSM. Relaunching as admin..." -ForegroundColor Yellow
+        Write-Host "Check service status with 'nssm status beszel-agent'"
+        Write-Host "Edit service configuration with 'nssm edit beszel-agent'"
+        
+        # Relaunch the script with the -Elevated switch and pass parameters
+        Start-Process powershell.exe -Verb RunAs -ArgumentList "-File `"$PSCommandPath`" -Elevated -Key `"$Key`" -Port $Port"
+        exit
+    }
+}
+
+# Admin tasks - service installation and firewall rules
+try {
+    $agentPath = Join-Path -Path $(scoop prefix beszel-agent) -ChildPath "beszel-agent.exe"
+    if (-not $agentPath) {
+        throw "Could not find beszel-agent executable. Make sure it was properly installed."
+    }
+    
+    # Install and configure the service
+    Write-Host "Installing beszel-agent service..."
+    
+    # Check if service already exists
+    $existingService = Get-Service -Name "beszel-agent" -ErrorAction SilentlyContinue
+    if ($existingService) {
+        Write-Host "Service already exists. Stopping and removing existing service..."
+        try {
+            nssm stop beszel-agent
+            nssm remove beszel-agent confirm
+        } catch {
+            Write-Host "Warning: Failed to remove existing service: $($_.Exception.Message)" -ForegroundColor Yellow
+        }
+    }
+    
+    nssm install beszel-agent $agentPath
+    if ($LASTEXITCODE -ne 0) {
+        throw "Failed to install beszel-agent service"
+    }
+    
+    Write-Host "Configuring service environment variables..."
+    nssm set beszel-agent AppEnvironmentExtra "+KEY=$Key"
+    nssm set beszel-agent AppEnvironmentExtra "+PORT=$Port"
+    
+    # Configure log files
+    $logDir = "$env:ProgramData\beszel-agent\logs"
+    if (-not (Test-Path $logDir)) {
+        New-Item -ItemType Directory -Path $logDir -Force | Out-Null
+    }
+    $logFile = "$logDir\beszel-agent.log"
+    nssm set beszel-agent AppStdout $logFile
+    nssm set beszel-agent AppStderr $logFile
+    
+    # Create a firewall rule if it doesn't exist
+    $ruleName = "Allow beszel-agent"
+    $existingRule = Get-NetFirewallRule -DisplayName $ruleName -ErrorAction SilentlyContinue
+    
+    # Remove existing rule if found
+    if ($existingRule) {
+        Write-Host "Removing existing firewall rule..."
+        try {
+            Remove-NetFirewallRule -DisplayName $ruleName
+            Write-Host "Existing firewall rule removed successfully."
+        } catch {
+            Write-Host "Warning: Failed to remove existing firewall rule: $($_.Exception.Message)" -ForegroundColor Yellow
+        }
+    }
+    
+    # Create new rule with current settings
+    Write-Host "Creating firewall rule for beszel-agent on port $Port..."
+    try {
+        New-NetFirewallRule -DisplayName $ruleName -Direction Inbound -Action Allow -Protocol TCP -LocalPort $Port
+        Write-Host "Firewall rule created successfully."
+    } catch {
+        Write-Host "Warning: Failed to create firewall rule: $($_.Exception.Message)" -ForegroundColor Yellow
+        Write-Host "You may need to manually create a firewall rule for port $Port." -ForegroundColor Yellow
+    }
+    
+    Write-Host "Starting beszel-agent service..."
+    nssm start beszel-agent
+    if ($LASTEXITCODE -ne 0) {
+        throw "Failed to start beszel-agent service"
+    }
+    
+    Write-Host "Checking beszel-agent service status..."
+    Start-Sleep -Seconds 5 # Allow time to start before checking status
+    $serviceStatus = nssm status beszel-agent
+    
+    if ($serviceStatus -eq "SERVICE_RUNNING") {
+        Write-Host "Success! The beszel-agent service is running properly." -ForegroundColor Green
+    } else {
+        Write-Host "Warning: The service status is '$serviceStatus' instead of 'SERVICE_RUNNING'." -ForegroundColor Yellow
+        Write-Host "You may need to troubleshoot the service installation." -ForegroundColor Yellow
+    }
+}
+catch {
+    Write-Host "ERROR: $($_.Exception.Message)" -ForegroundColor Red
+    Write-Host "Installation failed. Please check the error message above." -ForegroundColor Red
+}
+
+# Pause to see results before exit if this is an elevated window
+if ($Elevated) {
+    Write-Host "Press any key to exit..." -ForegroundColor Cyan
+    $null = $Host.UI.RawUI.ReadKey("NoEcho,IncludeKeyDown")
+}

supplemental/scripts/install-agent.sh

@@ -27,6 +27,7 @@ GITHUB_URL="https://github.com"
 GITHUB_API_URL="https://api.github.com" # not blocked in China currently
 GITHUB_PROXY_URL=""
 KEY=""
+AUTO_UPDATE_FLAG="" # empty string means prompt, "true" means auto-enable, "false" means skip
 
 # Check for help flag
 case "$1" in
@@ -37,8 +38,10 @@ case "$1" in
   printf "  -k                    : SSH key (required, or interactive if not provided)\n"
   printf "  -p                    : Port (default: $PORT)\n"
   printf "  -u                    : Uninstall Beszel Agent\n"
-  printf "  --china-mirrors [URL] : Use GitHub proxy (gh.beszel.dev) to resolve network timeout issues in mainland China\n"
-  printf "                          optional: specify a custom proxy URL, e.g., \"https://ghfast.top\"\n"
+  printf "  --auto-update [VALUE] : Control automatic daily updates\n"
+  printf "                          VALUE can be true (enable) or false (disable). If not specified, will prompt.\n"
+  printf "  --china-mirrors [URL] : Use GitHub proxy to resolve network timeout issues in mainland China\n"
+  printf "                          URL: optional custom proxy URL (default: https://gh.beszel.dev)\n"
   printf "  -h, --help            : Display this help message\n"
   exit 0
   ;;
@@ -84,17 +87,50 @@ while [ $# -gt 0 ]; do
   -u)
     UNINSTALL=true
     ;;
-  --china-mirrors)
-    if [ "$2" != "" ] && ! echo "$2" | grep -q '^-'; then
-      # use cstom proxy URL if provided
+  --china-mirrors*)
+    # Check if there's a value after the = sign
+    if echo "$1" | grep -q "="; then
+      # Extract the value after =
+      CUSTOM_PROXY=$(echo "$1" | cut -d'=' -f2)
+      if [ -n "$CUSTOM_PROXY" ]; then
+        GITHUB_PROXY_URL="$CUSTOM_PROXY"
+        GITHUB_URL="$(ensure_trailing_slash "$CUSTOM_PROXY")https://github.com"
+      else
+        GITHUB_PROXY_URL="https://gh.beszel.dev"
+        GITHUB_URL="$GITHUB_PROXY_URL"
+      fi
+    elif [ "$2" != "" ] && ! echo "$2" | grep -q '^-'; then
+      # use custom proxy URL provided as next argument
       GITHUB_PROXY_URL="$2"
       GITHUB_URL="$(ensure_trailing_slash "$2")https://github.com"
       shift
     else
+      # No value specified, use default
       GITHUB_PROXY_URL="https://gh.beszel.dev"
       GITHUB_URL="$GITHUB_PROXY_URL"
     fi
     ;;
+  --auto-update*)
+    # Check if there's a value after the = sign
+    if echo "$1" | grep -q "="; then
+      # Extract the value after =
+      AUTO_UPDATE_VALUE=$(echo "$1" | cut -d'=' -f2)
+      if [ "$AUTO_UPDATE_VALUE" = "true" ]; then
+        AUTO_UPDATE_FLAG="true"
+      elif [ "$AUTO_UPDATE_VALUE" = "false" ]; then
+        AUTO_UPDATE_FLAG="false"
+      else
+        echo "Invalid value for --auto-update flag: $AUTO_UPDATE_VALUE. Using default (prompt)."
+      fi
+    elif [ "$2" = "true" ] || [ "$2" = "false" ]; then
+      # Value provided as next argument
+      AUTO_UPDATE_FLAG="$2"
+      shift
+    else
+      # No value specified, use true
+      AUTO_UPDATE_FLAG="true"
+    fi
+    ;;
   *)
     echo "Invalid option: $1" >&2
     exit 1
@@ -348,8 +384,14 @@ EOF
   fi
 
   # Auto-update service for Alpine
-  printf "\nWould you like to enable automatic daily updates for beszel-agent? (y/n): "
-  read AUTO_UPDATE
+  if [ "$AUTO_UPDATE_FLAG" = "true" ]; then
+    AUTO_UPDATE="y"
+  elif [ "$AUTO_UPDATE_FLAG" = "false" ]; then
+    AUTO_UPDATE="n"
+  else
+    printf "\nWould you like to enable automatic daily updates for beszel-agent? (y/n): "
+    read AUTO_UPDATE
+  fi
   case "$AUTO_UPDATE" in
   [Yy]*)
     echo "Setting up daily automatic updates for beszel-agent..."
@@ -432,8 +474,16 @@ EOF
   service beszel-agent restart
 
   # Auto-update service for OpenWRT using a crontab job
-  printf "\nWould you like to enable automatic daily updates for beszel-agent? (y/n): "
-  read AUTO_UPDATE
+  if [ "$AUTO_UPDATE_FLAG" = "true" ]; then
+    AUTO_UPDATE="y"
+    sleep 1 # give time for the service to start
+  elif [ "$AUTO_UPDATE_FLAG" = "false" ]; then
+    AUTO_UPDATE="n"
+    sleep 1 # give time for the service to start
+  else
+    printf "\nWould you like to enable automatic daily updates for beszel-agent? (y/n): "
+    read AUTO_UPDATE
+  fi
   case "$AUTO_UPDATE" in
   [Yy]*)
     echo "Setting up daily automatic updates for beszel-agent..."
@@ -499,8 +549,16 @@ EOF
   systemctl start beszel-agent.service
 
   # Prompt for auto-update setup
-  printf "\nWould you like to enable automatic daily updates for beszel-agent? (y/n): "
-  read AUTO_UPDATE
+  if [ "$AUTO_UPDATE_FLAG" = "true" ]; then
+    AUTO_UPDATE="y"
+    sleep 1 # give time for the service to start
+  elif [ "$AUTO_UPDATE_FLAG" = "false" ]; then
+    AUTO_UPDATE="n"
+    sleep 1 # give time for the service to start
+  else
+    printf "\nWould you like to enable automatic daily updates for beszel-agent? (y/n): "
+    read AUTO_UPDATE
+  fi
   case "$AUTO_UPDATE" in
   [Yy]*)
     echo "Setting up daily automatic updates for beszel-agent..."