From 8fe305e329b0d7c9cacdf9e51c978783bf901572 Mon Sep 17 00:00:00 2001 From: rrole Date: Tue, 25 Nov 2025 13:09:20 +0100 Subject: [PATCH] Remove APP variable --- ct/wanderer.sh | 30 +++++++++++++++--------------- install/wanderer-install.sh | 10 +++++----- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/ct/wanderer.sh b/ct/wanderer.sh index 872fdd22b..d402bd766 100644 --- a/ct/wanderer.sh +++ b/ct/wanderer.sh @@ -26,38 +26,38 @@ function update_script() { check_container_resources if [[ ! -f /opt/wanderer/start.sh ]]; then - msg_error "No ${APP} Installation Found!" + msg_error "No wanderer Installation Found!" exit fi - if check_for_gh_release "$APP" "Flomp/wanderer"; then + if check_for_gh_release "wanderer" "Flomp/wanderer"; then - msg_info "Stopping $APP" + msg_info "Stopping wanderer" systemctl stop wanderer-web.service - msg_ok "Stopped $APP" + msg_ok "Stopped wanderer" - msg_info "Updating $APP" - $STD fetch_and_deploy_gh_release "$APP" "Flomp/wanderer" "tarball" "latest" "/opt/wanderer/source" + msg_info "Updating wanderer" + $STD fetch_and_deploy_gh_release "wanderer" "Flomp/wanderer" "tarball" "latest" "/opt/wanderer/source" cd /opt/wanderer/source/db $STD go mod tidy $STD go build cd /opt/wanderer/source/web $STD npm ci --omit=dev $STD npm run build - msg_ok "Updated $APP" + msg_ok "Updated wanderer" - msg_info "Starting $APP" - systemctl start "${APP}"-web.service - msg_ok "Started $APP" + msg_info "Starting wanderer" + systemctl start wanderer-web.service + msg_ok "Started wanderer" msg_ok "Update Successful" fi if check_for_gh_release "meilisearch" "meilisearch/meilisearch"; then - msg_info "Stopping $APP" + msg_info "Stopping wanderer" systemctl stop wanderer-web.service - msg_ok "Stopped $APP" + msg_ok "Stopped wanderer" msg_info "Updating Meilisearch" @@ -65,9 +65,9 @@ function update_script() { $STD fetch_and_deploy_gh_release "meilisearch" "meilisearch/meilisearch" "binary" "latest" "/opt/wanderer/source/search" msg_ok "Updated Meilisearch" - msg_info "Starting $APP" - systemctl start "${APP}"-web.service - msg_ok "Started $APP" + msg_info "Starting wanderer" + systemctl start wanderer-web.service + msg_ok "Started wanderer" msg_ok "Update Successful" fi exit diff --git a/install/wanderer-install.sh b/install/wanderer-install.sh index d7152671a..bc7da4a90 100644 --- a/install/wanderer-install.sh +++ b/install/wanderer-install.sh @@ -32,7 +32,7 @@ mkdir -p "/opt/wanderer/data/meili_data" $STD fetch_and_deploy_gh_release "wanderer" "Flomp/wanderer" "tarball" "latest" "/opt/wanderer/source" -msg_info "Installing ${APPLICATION} (patience)" +msg_info "Installing wanderer (patience)" cd /opt/wanderer/source/search $STD fetch_and_deploy_gh_release "meilisearch" "meilisearch/meilisearch" "binary" "latest" "/opt/wanderer/source/search" $STD meilisearch & @@ -45,7 +45,7 @@ cd /opt/wanderer/source/web $STD npm i -s vitest $STD npm ci --omit=dev $STD npm run build -msg_ok "Installed ${APPLICATION}" +msg_ok "Installed wanderer" msg_info "Modifying user, creating env file, scripts & services" MEILI_KEY=$(openssl rand -hex 32) @@ -76,9 +76,9 @@ cd /opt/wanderer/source/web && node build & wait -n EOF chmod +x /opt/wanderer/start.sh -cat </etc/systemd/system/"${APPLICATION}"-web.service +cat </etc/systemd/system/wanderer-web.service [Unit] -Description=${APPLICATION} +Description=wanderer After=network.target StartLimitIntervalSec=10 StartLimitBurst=5 @@ -94,7 +94,7 @@ RestartSec=1 WantedBy=multi-user.target EOF sleep 1 -systemctl enable -q --now "$APPLICATION"-web.service +systemctl enable -q --now wanderer-web.service msg_ok "Modified user, created env file, scripts and services" motd_ssh