diff --git a/compile.conf b/compile.conf index 6b8c7eb..1dde855 100644 --- a/compile.conf +++ b/compile.conf @@ -5,13 +5,6 @@ install=$HOME/.local/bin/hamclock gui=true steps=cd src && make && make hamclock-web-1600x960 && mkdir -p $HOME/.local/bin && mv hamclock-web-1600x960 $HOME/.local/bin/hamclock -[openhamclock] -version=26.2.1 -type=npm -git=https://github.com/accius/openhamclock.git -install=$HOME/.local/bin/openhamclock -steps=npm ci| cp .env.example .env| sudo rm -rf $HOME/.local/bin/openhamclock && mkdir -p $HOME/.local/bin/openhamclock && cp -r . $HOME/.local/bin/openhamclock - [direwolf] version=1.8.1 git=https://github.com/wb2osz/direwolf.git diff --git a/install-openhamclock.sh b/install-openhamclock.sh new file mode 100755 index 0000000..b682ab0 --- /dev/null +++ b/install-openhamclock.sh @@ -0,0 +1,9 @@ +#!/bin/bash +# +# Purpose : Install openhamclock + +if [ ! -d "$HOME/.local/bin/openhamclock" ]; then + (cd "$HOME/.local/bin" && curl -fsSL https://raw.githubusercontent.com/accius/openhamclock/main/scripts/setup-linux.sh | bash) +fi + +echo "openhamclock is installed"... \ No newline at end of file diff --git a/install.sh b/install.sh index 9e225ef..6d84760 100755 --- a/install.sh +++ b/install.sh @@ -128,6 +128,10 @@ fi echo "Installing utilities..." install_packages "${UTILITIES[@]}" +if ! command -v pm2 &> /dev/null; then + npm install pm2 -g +fi + cd ~/.local/share/HamPackServer echo "Enabling PHP extensions in /etc/php/php.ini..." @@ -174,10 +178,19 @@ else echo "Cockpit is already installed, skipping." fi +# Install openhamclock + +echo "Installing openhamclock..." +INSTALL_SUCCESS=true + +if ! bash install-openhamclock.sh; then + echo "Warning: install-openhamclock.sh encountered errors. openhamclock may not have installed correctly." + INSTALL_SUCCESS=false +fi + # Install Compiled Servers echo "Installing compiled servers..." -INSTALL_SUCCESS=true if ! bash install-compiled.sh; then echo "Warning: install-compiled.sh encountered errors. Some applications may not have installed correctly."