align with miniserver

This commit is contained in:
David Young
2026-10-23 08:21:53 -06:00
parent 0f86e92b88
commit f851678d46
5 changed files with 13 additions and 69 deletions
+4 -18
View File
@@ -1,10 +1,10 @@
#!/bin/bash
#
# Purpose : Keep HamPackServer current (run by CoreDesktop's `update`, and by install.sh)
# Purpose : Keep HamPackServer current (run by MiniServer's `update`, and by install.sh)
SELF="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
COREDESKTOP="$HOME/.local/share/coredesktop"
source "$COREDESKTOP/utils.sh"
MINISERVER="$HOME/.local/share/MiniServer"
source "$MINISERVER/utils.sh"
# Scripts and the check tool find files in this repo through $HAMPACKSERVER_DIR
export HAMPACKSERVER_DIR="$SELF"
@@ -23,7 +23,7 @@ step() {
}
remove_stale_files() {
# Replaced by CoreDesktop's `update` and `sibling add`
# Replaced by MiniServer's `update` and `sibling add`
rm -f "$HOME/.local/bin/hampackserverupdate" "$HOME/.local/bin/hampackserverrefresh"
}
@@ -37,17 +37,6 @@ install_hampackserver_packages() {
install_packages "${SERVERS[@]}" && install_packages "${UTILITIES[@]}"
}
install_pm2() {
command -v pm2 &> /dev/null || npm install pm2 -g --prefix "$HOME/.local"
}
enable_cockpit() {
if ! systemctl is-enabled cockpit.socket &> /dev/null; then
sudo systemctl enable --now cockpit.socket &&
echo "Cockpit enabled. Access it at http://localhost:9090"
fi
}
# Install the hamclock system service, restarting hamclock if the service or
# the binary changed
install_hamclock_service() {
@@ -92,9 +81,6 @@ HAMCLOCK_MTIME=$(hamclock_mtime)
step "Removing stale HamPackServer files" remove_stale_files
step "Installing HamPackServer tools" install_tools
step "Installing HamPackServer packages" install_hampackserver_packages
step "Installing pm2" install_pm2
step "Enabling Cockpit" enable_cockpit
step "Configuring networking" bash "$SELF/fix-networking.sh"
step "Installing compiled servers" bash "$SELF/install-compiled.sh"
step "Installing hamclock service" install_hamclock_service
step "Installing openhamclock" bash "$SELF/install-openhamclock.sh"