From 683095b6d7fa675f0777f5f027457249d1129db3 Mon Sep 17 00:00:00 2001 From: elpatron Date: Sun, 19 Jan 2025 15:53:11 +0100 Subject: [PATCH] Move variables to env.cmd --- build_agent.cmd | 5 ++--- install-beszel-service.cmd | 5 +---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/build_agent.cmd b/build_agent.cmd index 87ca283..9b3b073 100644 --- a/build_agent.cmd +++ b/build_agent.cmd @@ -4,6 +4,8 @@ echo This script downloads the Beszel repository and builds the Beszel agent for echo If not yet installed, Git and Go will be installed via Winget. echo. +call env.cmd + where winget.exe >nul 2>&1 if %errorlevel% NEQ 0 ( echo Winget not found, install Winget or use a compatible OS: Win 10 Client OS or later @@ -38,9 +40,6 @@ if %errorlevel% NEQ 0 ( cd .\beszel\beszel\cmd\agent echo Building agent -set GOOS=windows -set GOARCH=amd64 -set CGO_ENABLED=0 go build -ldflags "-w -s" . >nul 2>&1 if %errorlevel% NEQ 0 ( echo Something went wrong diff --git a/install-beszel-service.cmd b/install-beszel-service.cmd index c65ab86..9c1596a 100644 --- a/install-beszel-service.cmd +++ b/install-beszel-service.cmd @@ -19,10 +19,7 @@ if !%2==! goto help set BESZELKEYPREFIX=%1 set BESZELKEY=%2 -set SERVICENAME=BeszelAgent -set DESTINATIONDIR=%ProgramFiles%\%SERVICENAME% -set AGENTEXE=%DESTINATIONDIR%\agent.exe -set NSSMEXE=nssm.exe +call env.cmd where nssm.exe >nul 2>&1 if %errorlevel% NEQ 0 goto installnssm