From ee6a456b664643a3e46370a896743f718008953a Mon Sep 17 00:00:00 2001 From: Henry Dollman Date: Sat, 18 Jan 2025 18:09:02 -0500 Subject: [PATCH] chore(install-agent): formatting + rm unused variable --- supplemental/scripts/install-agent.sh | 66 +++++++++++++-------------- 1 file changed, 32 insertions(+), 34 deletions(-) diff --git a/supplemental/scripts/install-agent.sh b/supplemental/scripts/install-agent.sh index 22feee2..4aba731 100755 --- a/supplemental/scripts/install-agent.sh +++ b/supplemental/scripts/install-agent.sh @@ -1,6 +1,5 @@ #!/bin/sh -# Move is_alpine function to the top of the file is_alpine() { [ -f /etc/alpine-release ] } @@ -9,7 +8,6 @@ is_openwrt() { cat /etc/os-release | grep -q "OpenWrt" } -version=0.0.1 # Define default values PORT=45876 UNINSTALL=false @@ -133,12 +131,12 @@ if [ "$UNINSTALL" = true ]; then systemctl daemon-reload fi -echo "Removing the Beszel Agent directory..." -rm -rf /opt/beszel-agent + echo "Removing the Beszel Agent directory..." + rm -rf /opt/beszel-agent -echo "Removing the dedicated user for the agent service..." -killall beszel-agent 2>/dev/null -if is_alpine || is_openwrt; then + echo "Removing the dedicated user for the agent service..." + killall beszel-agent 2>/dev/null + if is_alpine || is_openwrt; then deluser beszel 2>/dev/null else userdel beszel 2>/dev/null @@ -174,10 +172,10 @@ if is_alpine; then apk add tar curl coreutils shadow fi elif is_openwrt; then - if ! package_installed tar || ! package_installed curl || ! package_installed coreutils; then - opkg update - opkg install tar curl coreutils - fi + if ! package_installed tar || ! package_installed curl || ! package_installed coreutils; then + opkg update + opkg install tar curl coreutils + fi elif package_installed apt-get; then if ! package_installed tar || ! package_installed curl || ! package_installed sha256sum; then apt-get update @@ -407,36 +405,36 @@ update() { EOF - # Enable the service - chmod +x /etc/init.d/beszel-agent - service beszel-agent enable + # Enable the service + chmod +x /etc/init.d/beszel-agent + service beszel-agent enable - # Start the service - service beszel-agent restart + # Start the service + 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 - case "$AUTO_UPDATE" in - [Yy]*) - echo "Setting up daily automatic updates for beszel-agent..." + # 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 + case "$AUTO_UPDATE" in + [Yy]*) + echo "Setting up daily automatic updates for beszel-agent..." - cat >/etc/crontabs/beszel </etc/crontabs/beszel </dev/null 2>&1; then - echo "Error: The Beszel Agent service is not running." - service beszel-agent status - exit 1 - fi + # Check service status + if ! service beszel-agent running >/dev/null 2>&1; then + echo "Error: The Beszel Agent service is not running." + service beszel-agent status + exit 1 + fi else # Original systemd service installation code @@ -512,4 +510,4 @@ EOF fi fi -printf "\n\033[32mBeszel Agent has been installed successfully! It is now running on port $PORT.\033[0m\n" \ No newline at end of file +printf "\n\033[32mBeszel Agent has been installed successfully! It is now running on port $PORT.\033[0m\n"