From 6e63fb3e5f84afb4a56a51907b1f4d9b63a15bd8 Mon Sep 17 00:00:00 2001 From: MickLesk <47820557+MickLesk@users.noreply.github.com> Date: Fri, 2 Oct 2026 19:56:37 +0200 Subject: [PATCH] Scripts: close every msg_info block with msg_ok Past-tense msg_info calls that should have been msg_ok, notices that opened a block before a prompt, and blocks without a closing msg_ok. These already left a stale spinner; with core's block stack they would resume it after every later msg_ok. --- ct/alpine-borgbackup-server.sh | 4 +--- ct/alpine-komodo.sh | 4 ++-- ct/beszel.sh | 2 +- ct/cloudreve.sh | 2 +- ct/convertx.sh | 2 +- ct/coolify.sh | 4 ++-- ct/cryptpad.sh | 2 +- ct/dispatcharr.sh | 1 - ct/dockge.sh | 4 ++-- ct/dokploy.sh | 4 ++-- ct/domain-locker.sh | 4 ++-- ct/domain-monitor.sh | 2 +- ct/duplicati.sh | 2 +- ct/excalidraw.sh | 2 +- ct/fluid-calendar.sh | 2 +- ct/gitea-mirror.sh | 4 ++-- ct/graylog.sh | 2 +- ct/kasm.sh | 2 +- ct/komodo.sh | 2 +- ct/livebook.sh | 5 +++-- ct/metabase.sh | 2 +- ct/pangolin.sh | 2 +- ct/peanut.sh | 2 +- ct/plant-it.sh | 2 +- ct/revealjs.sh | 2 +- ct/runtipi.sh | 4 ++-- ct/rustdeskserver.sh | 2 +- ct/seelf.sh | 2 +- ct/streamlink-webui.sh | 2 +- ct/stylus.sh | 2 +- install/bar-assistant-install.sh | 2 +- install/cosmos-install.sh | 2 +- install/domain-locker-install.sh | 4 ++-- install/fileflows-install.sh | 3 +-- install/forgejo-runner-install.sh | 1 - install/languagetool-install.sh | 4 +--- install/mail-archiver-install.sh | 2 +- install/paperclip-install.sh | 4 ++-- install/plant-it-install.sh | 2 +- install/podman-homeassistant-install.sh | 3 ++- install/podman-install.sh | 3 ++- install/searxng-install.sh | 2 +- install/sportarr-install.sh | 2 +- tools/addon/add-netbird-lxc.sh | 1 - tools/addon/add-tailscale-lxc.sh | 3 +-- tools/addon/phpmyadmin.sh | 3 ++- tools/pve/update-apps.sh | 3 +-- 47 files changed, 58 insertions(+), 64 deletions(-) diff --git a/ct/alpine-borgbackup-server.sh b/ct/alpine-borgbackup-server.sh index ca25e1df9..6bbfd87da 100644 --- a/ct/alpine-borgbackup-server.sh +++ b/ct/alpine-borgbackup-server.sh @@ -48,9 +48,7 @@ function update_script() { exit fi - msg_info "Setting up SSH Public Key for backup user" - - msg_info "Please paste your SSH public key (e.g., ssh-rsa AAAAB3... user@host): \n" + echo -e "${INFO}${YW}Please paste your SSH public key (e.g., ssh-rsa AAAAB3... user@host):${CL}" read -p "Key: " SSH_PUBLIC_KEY echo diff --git a/ct/alpine-komodo.sh b/ct/alpine-komodo.sh index b99f1c5e1..bb591091d 100644 --- a/ct/alpine-komodo.sh +++ b/ct/alpine-komodo.sh @@ -31,7 +31,7 @@ function update_script() { msg_warn "⚠️ ${APP} has been migrated to an addon script." echo "" - msg_info "This is a one-time migration. After this, you can update ${APP} anytime with:" + echo -e "${INFO}${YW}This is a one-time migration. After this, you can update ${APP} anytime with:${CL}" echo -e "${TAB}${TAB}${GN}update_komodo${CL} or ${GN}bash <(curl -fsSL ${ADDON_SCRIPT})${CL}" echo "" read -r -p "${TAB}Migrate update function now? [y/N]: " CONFIRM @@ -62,7 +62,7 @@ MIGRATION_EOF ln -sf /usr/bin/update /usr/bin/update_komodo 2>/dev/null || true msg_ok "Migration complete" - msg_info "Running addon update" + echo -e "${INFO}${YW}Running addon update${CL}" type=update bash <(curl -fsSL "${ADDON_SCRIPT}") exit } diff --git a/ct/beszel.sh b/ct/beszel.sh index 0a9d4a4a2..5aad94f0b 100644 --- a/ct/beszel.sh +++ b/ct/beszel.sh @@ -33,7 +33,7 @@ function update_script() { if check_for_gh_release "beszel" "henrygd/beszel"; then msg_info "Stopping Service" systemctl stop beszel-hub - msg_info "Stopped Service" + msg_ok "Stopped Service" msg_info "Updating Beszel" $STD /opt/beszel/beszel update diff --git a/ct/cloudreve.sh b/ct/cloudreve.sh index 75436e39e..c2ad1ef15 100644 --- a/ct/cloudreve.sh +++ b/ct/cloudreve.sh @@ -33,7 +33,7 @@ function update_script() { if check_for_gh_release "cloudreve" "cloudreve/cloudreve"; then msg_info "Stopping Service" systemctl stop cloudreve - msg_info "Stopped Service" + msg_ok "Stopped Service" fetch_and_deploy_gh_release "cloudreve" "cloudreve/cloudreve" "prebuild" "latest" "/opt/cloudreve" "*linux_$(arch_resolve).tar.gz" diff --git a/ct/convertx.sh b/ct/convertx.sh index 0f8c37167..39ebbbeec 100644 --- a/ct/convertx.sh +++ b/ct/convertx.sh @@ -33,7 +33,7 @@ function update_script() { if check_for_gh_release "ConvertX" "C4illin/ConvertX"; then msg_info "Stopping Service" systemctl stop convertx - msg_info "Stopped Service" + msg_ok "Stopped Service" ensure_dependencies libreoffice-writer dasel graphicsmagick libemail-outlook-message-perl libheif-examples libjxl-tools resvg diff --git a/ct/coolify.sh b/ct/coolify.sh index e911a6d97..7d1ffe012 100644 --- a/ct/coolify.sh +++ b/ct/coolify.sh @@ -35,7 +35,7 @@ function update_script() { msg_warn "⚠️ ${APP} has been migrated to an addon script." echo "" - msg_info "This is a one-time migration. After this, you can update ${APP} anytime with:" + echo -e "${INFO}${YW}This is a one-time migration. After this, you can update ${APP} anytime with:${CL}" echo -e "${TAB}${TAB}${GN}update_coolify${CL} or ${GN}bash <(curl -fsSL ${ADDON_SCRIPT})${CL}" echo "" read -r -p "${TAB}Migrate update function now? [y/N]: " CONFIRM @@ -58,7 +58,7 @@ MIGRATION_EOF ln -sf /usr/bin/update /usr/bin/update_coolify 2>/dev/null || true msg_ok "Migration complete" - msg_info "Running addon update" + echo -e "${INFO}${YW}Running addon update${CL}" type=update bash <(curl -fsSL "${ADDON_SCRIPT}") exit } diff --git a/ct/cryptpad.sh b/ct/cryptpad.sh index fc13fb716..81d502753 100644 --- a/ct/cryptpad.sh +++ b/ct/cryptpad.sh @@ -33,7 +33,7 @@ function update_script() { if check_for_gh_release "cryptpad" "cryptpad/cryptpad"; then msg_info "Stopping Service" systemctl stop cryptpad - msg_info "Stopped Service" + msg_ok "Stopped Service" create_backup /opt/cryptpad/config/config.js \ /opt/cryptpad/blob \ diff --git a/ct/dispatcharr.sh b/ct/dispatcharr.sh index 29083b80e..f60975607 100644 --- a/ct/dispatcharr.sh +++ b/ct/dispatcharr.sh @@ -137,7 +137,6 @@ EOF set +o allexport if [[ -n "$POSTGRES_DB" ]] && [[ -n "$POSTGRES_USER" ]] && [[ -n "$POSTGRES_PASSWORD" ]]; then PGPASSWORD=$POSTGRES_PASSWORD pg_dump -U "$POSTGRES_USER" -h "${POSTGRES_HOST:-localhost}" -p "${POSTGRES_PORT:-5432}" "$POSTGRES_DB" >/tmp/dispatcharr_db_$(date +%F).sql - msg_info "Database backup created" fi fi $STD tar -czf "$BACKUP_FILE" -C /opt dispatcharr /tmp/dispatcharr_db_*.sql diff --git a/ct/dockge.sh b/ct/dockge.sh index f09e1d282..04433bc54 100644 --- a/ct/dockge.sh +++ b/ct/dockge.sh @@ -35,7 +35,7 @@ function update_script() { msg_warn "⚠️ ${APP} has been migrated to an addon script." echo "" - msg_info "This is a one-time migration. After this, you can update ${APP} anytime with:" + echo -e "${INFO}${YW}This is a one-time migration. After this, you can update ${APP} anytime with:${CL}" echo -e "${TAB}${TAB}${GN}update_dockge${CL} or ${GN}bash <(curl -fsSL ${ADDON_SCRIPT})${CL}" echo "" read -r -p "${TAB}Migrate update function now? [y/N]: " CONFIRM @@ -60,7 +60,7 @@ MIGRATION_EOF ln -sf /usr/bin/update /usr/bin/update_dockge 2>/dev/null || true msg_ok "Migration complete" - msg_info "Running addon update" + echo -e "${INFO}${YW}Running addon update${CL}" type=update bash <(curl -fsSL "${ADDON_SCRIPT}") exit } diff --git a/ct/dokploy.sh b/ct/dokploy.sh index cc0ab9e27..ceef5d112 100644 --- a/ct/dokploy.sh +++ b/ct/dokploy.sh @@ -35,7 +35,7 @@ function update_script() { msg_warn "⚠️ ${APP} has been migrated to an addon script." echo "" - msg_info "This is a one-time migration. After this, you can update ${APP} anytime with:" + echo -e "${INFO}${YW}This is a one-time migration. After this, you can update ${APP} anytime with:${CL}" echo -e "${TAB}${TAB}${GN}update_dokploy${CL} or ${GN}bash <(curl -fsSL ${ADDON_SCRIPT})${CL}" echo "" read -r -p "${TAB}Migrate update function now? [y/N]: " CONFIRM @@ -58,7 +58,7 @@ MIGRATION_EOF ln -sf /usr/bin/update /usr/bin/update_dokploy 2>/dev/null || true msg_ok "Migration complete" - msg_info "Running addon update" + echo -e "${INFO}${YW}Running addon update${CL}" type=update bash <(curl -fsSL "${ADDON_SCRIPT}") exit } diff --git a/ct/domain-locker.sh b/ct/domain-locker.sh index 59dd8673f..00c76310d 100644 --- a/ct/domain-locker.sh +++ b/ct/domain-locker.sh @@ -35,7 +35,7 @@ function update_script() { if check_for_gh_release "domain-locker" "Lissy93/domain-locker"; then msg_info "Stopping Service" systemctl stop domain-locker - msg_info "Service stopped" + msg_ok "Stopped Service" PG_VERSION="17" setup_postgresql NODE_VERSION="22" setup_nodejs @@ -51,7 +51,7 @@ function update_script() { source /opt/domain-locker.env set +a $STD npm run build - msg_info "Built Domain-Locker" + msg_ok "Built Domain-Locker" msg_info "Restarting Services" systemctl start domain-locker diff --git a/ct/domain-monitor.sh b/ct/domain-monitor.sh index cfd3329e3..ab01f0446 100644 --- a/ct/domain-monitor.sh +++ b/ct/domain-monitor.sh @@ -42,7 +42,7 @@ function update_script() { if check_for_gh_release "domain-monitor" "Hosteroid/domain-monitor"; then msg_info "Stopping Service" systemctl stop apache2 - msg_info "Service stopped" + msg_ok "Stopped Service" create_backup /opt/domain-monitor/.env diff --git a/ct/duplicati.sh b/ct/duplicati.sh index cc8400b18..0a24ea5e1 100644 --- a/ct/duplicati.sh +++ b/ct/duplicati.sh @@ -33,7 +33,7 @@ function update_script() { if check_for_gh_release "duplicati" "duplicati/duplicati"; then msg_info "Stopping Service" systemctl stop duplicati - msg_info "Stopped Service" + msg_ok "Stopped Service" fetch_and_deploy_gh_release "duplicati" "duplicati/duplicati" "binary" "latest" "/opt/duplicati" "duplicati-*-linux-$(arch_resolve "x64" "arm64")-gui.deb" diff --git a/ct/excalidraw.sh b/ct/excalidraw.sh index 6353d8755..eb39941a3 100644 --- a/ct/excalidraw.sh +++ b/ct/excalidraw.sh @@ -36,7 +36,7 @@ function update_script() { if check_for_gh_release "excalidraw" "excalidraw/excalidraw"; then msg_info "Stopping Service" systemctl stop excalidraw - msg_info "Stopped Service" + msg_ok "Stopped Service" CLEAN_INSTALL=1 fetch_and_deploy_gh_release "excalidraw" "excalidraw/excalidraw" "tarball" diff --git a/ct/fluid-calendar.sh b/ct/fluid-calendar.sh index 1df61d475..99763d36b 100644 --- a/ct/fluid-calendar.sh +++ b/ct/fluid-calendar.sh @@ -37,7 +37,7 @@ function update_script() { if check_for_gh_release "fluid-calendar" "dotnetfactory/fluid-calendar"; then msg_info "Stopping Service" systemctl stop fluid-calendar - msg_info "Stopped Service" + msg_ok "Stopped Service" create_backup /opt/fluid-calendar/.env CLEAN_INSTALL=1 fetch_and_deploy_gh_release "fluid-calendar" "dotnetfactory/fluid-calendar" "tarball" diff --git a/ct/gitea-mirror.sh b/ct/gitea-mirror.sh index 735ad7ea3..780523f80 100644 --- a/ct/gitea-mirror.sh +++ b/ct/gitea-mirror.sh @@ -50,10 +50,10 @@ function update_script() { echo "" read -r -p "Final confirmation - proceed? (y/N): " CONFIRM2 if [[ ! "$CONFIRM2" =~ ^[Yy]$ ]]; then - msg_info "Update cancelled. Please backup your configuration before proceeding." + msg_warn "Update cancelled. Please backup your configuration before proceeding." exit 0 fi - msg_info "Proceeding with version $APP_VERSION update. All configuration will be cleared as warned." + msg_warn "Proceeding with version $APP_VERSION update. All configuration will be cleared as warned." rm -rf /opt/gitea-mirror fi diff --git a/ct/graylog.sh b/ct/graylog.sh index 83b5a8827..884f10b35 100644 --- a/ct/graylog.sh +++ b/ct/graylog.sh @@ -34,7 +34,7 @@ function update_script() { msg_info "Stopping Service" systemctl stop graylog-datanode systemctl stop graylog-server - msg_info "Stopped Service" + msg_ok "Stopped Service" CURRENT_VERSION=$(apt list --installed 2>/dev/null | grep graylog-server | grep -oP '\d+\.\d+\.\d+') diff --git a/ct/kasm.sh b/ct/kasm.sh index 4abecf335..e53d6a0ee 100644 --- a/ct/kasm.sh +++ b/ct/kasm.sh @@ -52,7 +52,7 @@ function update_script() { msg_error "Unable to detect latest Kasm release URL." exit 250 fi - msg_info "Checked for new version" + msg_ok "Checked for new version" msg_info "Removing outdated docker-compose plugin" [ -f ~/.docker/cli-plugins/docker-compose ] && rm -rf ~/.docker/cli-plugins/docker-compose diff --git a/ct/komodo.sh b/ct/komodo.sh index 214667401..0c98a6771 100644 --- a/ct/komodo.sh +++ b/ct/komodo.sh @@ -66,7 +66,7 @@ MIGRATION_EOF ln -sf /usr/bin/update /usr/bin/update_komodo 2>/dev/null || true msg_ok "Migration complete" - msg_info "Running addon update" + echo -e "${INFO}${YW}Running addon update${CL}" type=update bash <(curl -fsSL "${ADDON_SCRIPT}") exit } diff --git a/ct/livebook.sh b/ct/livebook.sh index 05ec8c7eb..5ccbe1012 100755 --- a/ct/livebook.sh +++ b/ct/livebook.sh @@ -34,7 +34,7 @@ function update_script() { if check_for_gh_release "livebook" "livebook-dev/livebook"; then msg_info "Stopping Service" systemctl stop livebook - msg_info "Stopped Service" + msg_ok "Stopped Service" msg_info "Updating Container" apt_update_safe @@ -47,10 +47,11 @@ function update_script() { $STD mix escript.install hex livebook --force chown -R livebook:livebook /opt/livebook /data + msg_ok "Updated Livebook" msg_info "Starting Service" systemctl start livebook - msg_info "Started Service" + msg_ok "Started Service" msg_ok "Updated successfully!" fi diff --git a/ct/metabase.sh b/ct/metabase.sh index 70819db81..df35d3d6f 100644 --- a/ct/metabase.sh +++ b/ct/metabase.sh @@ -33,7 +33,7 @@ function update_script() { if check_for_gh_release "metabase" "metabase/metabase"; then msg_info "Stopping Service" systemctl stop metabase - msg_info "Stopped Service" + msg_ok "Stopped Service" msg_info "Creating backup" mv /opt/metabase/.env /opt diff --git a/ct/pangolin.sh b/ct/pangolin.sh index 5868f490a..e629a0bd8 100644 --- a/ct/pangolin.sh +++ b/ct/pangolin.sh @@ -52,7 +52,7 @@ function update_script() { msg_info "Stopping Service" systemctl stop pangolin systemctl stop gerbil - msg_info "Service stopped" + msg_ok "Stopped Service" DB_URL=$(sed -n 's/.*connection_string: "\(.*\)".*/\1/p' /opt/pangolin/config/config.yml) create_backup /opt/pangolin/config diff --git a/ct/peanut.sh b/ct/peanut.sh index 146530c56..4127d85ca 100644 --- a/ct/peanut.sh +++ b/ct/peanut.sh @@ -35,7 +35,7 @@ function update_script() { if check_for_gh_release "PeaNUT" "Brandawg93/PeaNUT"; then msg_info "Stopping Service" systemctl stop peanut - msg_info "Stopped Service" + msg_ok "Stopped Service" CLEAN_INSTALL=1 fetch_and_deploy_gh_release "PeaNUT" "Brandawg93/PeaNUT" "tarball" "latest" "/opt/peanut" diff --git a/ct/plant-it.sh b/ct/plant-it.sh index 5359de55b..3dd452ec7 100644 --- a/ct/plant-it.sh +++ b/ct/plant-it.sh @@ -34,7 +34,7 @@ function update_script() { if check_for_gh_release "plant-it" "MDeLuise/plant-it" "${RELEASE}" "last version that includes the web frontend"; then msg_info "Stopping Service" systemctl stop plant-it - msg_info "Stopped Service" + msg_ok "Stopped Service" USE_ORIGINAL_FILENAME="true" fetch_and_deploy_gh_release "plant-it" "MDeLuise/plant-it" "singlefile" "${RELEASE}" "/opt/plant-it/backend" "server.jar" fetch_and_deploy_gh_release "plant-it-front" "MDeLuise/plant-it" "prebuild" "${RELEASE}" "/opt/plant-it/frontend" "client.tar.gz" diff --git a/ct/revealjs.sh b/ct/revealjs.sh index 805c54b05..3ff08f31e 100644 --- a/ct/revealjs.sh +++ b/ct/revealjs.sh @@ -33,7 +33,7 @@ function update_script() { if check_for_gh_release "revealjs" "hakimel/reveal.js"; then msg_info "Stopping Service" systemctl stop revealjs - msg_info "Stopped Service" + msg_ok "Stopped Service" cp /opt/revealjs/index.html /opt fetch_and_deploy_gh_release "revealjs" "hakimel/reveal.js" "tarball" diff --git a/ct/runtipi.sh b/ct/runtipi.sh index 4caa48349..b0f3c69f3 100644 --- a/ct/runtipi.sh +++ b/ct/runtipi.sh @@ -35,7 +35,7 @@ function update_script() { msg_warn "⚠️ ${APP} has been migrated to an addon script." echo "" - msg_info "This is a one-time migration. After this, you can update ${APP} anytime with:" + echo -e "${INFO}${YW}This is a one-time migration. After this, you can update ${APP} anytime with:${CL}" echo -e "${TAB}${TAB}${GN}update_runtipi${CL} or ${GN}bash <(curl -fsSL ${ADDON_SCRIPT})${CL}" echo "" read -r -p "${TAB}Migrate update function now? [y/N]: " CONFIRM @@ -58,7 +58,7 @@ MIGRATION_EOF ln -sf /usr/bin/update /usr/bin/update_runtipi 2>/dev/null || true msg_ok "Migration complete" - msg_info "Running addon update" + echo -e "${INFO}${YW}Running addon update${CL}" type=update bash <(curl -fsSL "${ADDON_SCRIPT}") exit } diff --git a/ct/rustdeskserver.sh b/ct/rustdeskserver.sh index 42845a3c1..b270d95fc 100644 --- a/ct/rustdeskserver.sh +++ b/ct/rustdeskserver.sh @@ -45,7 +45,7 @@ update_deb_based() { if [[ -f /lib/systemd/system/rustdesk-api.service ]]; then systemctl stop rustdesk-api fi - msg_info "Stopped Service" + msg_ok "Stopped Service" fetch_and_deploy_gh_release "rustdesk-hbbr" "lejianwen/rustdesk-server" "binary" "latest" "/opt/rustdesk" "rustdesk-server-hbbr*$(arch_resolve).deb" fetch_and_deploy_gh_release "rustdesk-hbbs" "lejianwen/rustdesk-server" "binary" "latest" "/opt/rustdesk" "rustdesk-server-hbbs*$(arch_resolve).deb" diff --git a/ct/seelf.sh b/ct/seelf.sh index 4f706eef1..1e239cfbf 100644 --- a/ct/seelf.sh +++ b/ct/seelf.sh @@ -33,7 +33,7 @@ function update_script() { if check_for_gh_release "seelf" "YuukanOO/seelf"; then msg_info "Stopping Service" systemctl stop seelf - msg_info "Stopped Service" + msg_ok "Stopped Service" msg_info "Updating seelf" cd /opt/seelf diff --git a/ct/streamlink-webui.sh b/ct/streamlink-webui.sh index 53fff6824..15eb376cf 100644 --- a/ct/streamlink-webui.sh +++ b/ct/streamlink-webui.sh @@ -34,7 +34,7 @@ function update_script() { if check_for_gh_release "streamlink-webui" "CrazyWolf13/streamlink-webui"; then msg_info "Stopping Service" systemctl stop streamlink-webui - msg_info "Stopped Service" + msg_ok "Stopped Service" NODE_VERSION="22" NODE_MODULE="yarn" setup_nodejs setup_uv diff --git a/ct/stylus.sh b/ct/stylus.sh index 4dfca4e22..c504847f4 100644 --- a/ct/stylus.sh +++ b/ct/stylus.sh @@ -34,7 +34,7 @@ function update_script() { if check_for_gh_release "stylus" "mmastrac/stylus"; then msg_info "Stopping Service" systemctl stop stylus - msg_info "Stopped Service" + msg_ok "Stopped Service" fetch_and_deploy_gh_release "stylus" "mmastrac/stylus" "singlefile" "latest" "/usr/bin/" "*_linux_$(arch_resolve)" diff --git a/install/bar-assistant-install.sh b/install/bar-assistant-install.sh index b4830fab7..ad846d7ed 100644 --- a/install/bar-assistant-install.sh +++ b/install/bar-assistant-install.sh @@ -34,7 +34,7 @@ msg_info "Configuring PHP" PHPVER=$(php -r 'echo PHP_MAJOR_VERSION . "." . PHP_MINOR_VERSION . "\n";') sed -i.bak -E 's/^\s*;?\s*ffi\.enable\s*=.*/ffi.enable=true/' /etc/php/${PHPVER}/fpm/php.ini $STD systemctl reload php${PHPVER}-fpm -msg_info "configured PHP" +msg_ok "Configured PHP" msg_info "Installing Bar Assistant" cd /opt/bar-assistant diff --git a/install/cosmos-install.sh b/install/cosmos-install.sh index 04e75422a..183bce8b3 100644 --- a/install/cosmos-install.sh +++ b/install/cosmos-install.sh @@ -55,7 +55,7 @@ WantedBy=multi-user.target EOF systemctl enable -q --now cosmos -msg_info "Created Service" +msg_ok "Created Service" motd_ssh customize diff --git a/install/domain-locker-install.sh b/install/domain-locker-install.sh index 093c61144..85f388660 100644 --- a/install/domain-locker-install.sh +++ b/install/domain-locker-install.sh @@ -46,7 +46,7 @@ set -a source /opt/domain-locker.env set +a $STD npm run build -msg_info "Built Domain-Locker" +msg_ok "Built Domain-Locker" msg_info "Building Database schema" export PGPASSWORD="$DL_PG_PASSWORD" @@ -69,7 +69,7 @@ Restart=always WantedBy=multi-user.target EOF systemctl enable -q --now domain-locker -msg_info "Created Service" +msg_ok "Created Service" motd_ssh customize diff --git a/install/fileflows-install.sh b/install/fileflows-install.sh index 1a18a3c2d..fbb623ae1 100644 --- a/install/fileflows-install.sh +++ b/install/fileflows-install.sh @@ -54,12 +54,11 @@ if [[ "$install_server" =~ ^[Ss]$ ]]; then systemctl enable -q --now fileflows msg_ok "Installed FileFlows Server" else - msg_info "Installing FileFlows Agent" - stop_spinner read -r -p "${TAB3}Enter FileFlows Server URL (e.g. http://192.168.1.10:19200): " server_url while [[ -z "${server_url// /}" ]]; do read -r -p "${TAB3}Enter FileFlows Server URL (e.g. http://192.168.1.10:19200): " server_url done + msg_info "Installing FileFlows Agent" cd /opt/fileflows/Agent before_units="$(systemctl list-unit-files 'fileflows*' --no-legend 2>/dev/null | awk '{print $1}' | sort || true)" $STD dotnet FileFlows.Agent.dll --server "$server_url" --systemd install --root true diff --git a/install/forgejo-runner-install.sh b/install/forgejo-runner-install.sh index 94ceb6877..23196c174 100644 --- a/install/forgejo-runner-install.sh +++ b/install/forgejo-runner-install.sh @@ -69,7 +69,6 @@ chmod +x /usr/local/bin/forgejo-runner echo "${RUNNER_VERSION}" >~/.forgejo-runner msg_ok "Installed Forgejo Runner" -msg_info "Registering Forgejo Runner" export DOCKER_HOST="unix:///run/podman/podman.sock" msg_info "Generating Forgejo Runner Configuration" diff --git a/install/languagetool-install.sh b/install/languagetool-install.sh index dd6930e44..224bd1515 100644 --- a/install/languagetool-install.sh +++ b/install/languagetool-install.sh @@ -60,18 +60,16 @@ if [[ -n "$lang_code" ]]; then filename=$(curl -fsSL https://languagetool.org/download/ngram-data/ | grep -oP "ngrams-${lang_code}-[0-9]+\.zip" | sort -uV | tail -n1) if [[ -n "$filename" ]]; then - msg_info "Downloading $filename" download_file "https://languagetool.org/download/ngram-data/${filename}" "/tmp/${filename}" mkdir -p /opt/ngrams - msg_info "Extracting $lang_code ngrams to /opt/ngrams" unzip -q "/tmp/${filename}" -d /opt/ngrams rm "/tmp/${filename}" ngram_dir="/opt/ngrams" msg_ok "Installed $lang_code ngrams" else - msg_info "No ngram file found for ${lang_code}" + msg_warn "No ngram file found for ${lang_code}" fi else msg_error "Invalid language code: $lang_code" diff --git a/install/mail-archiver-install.sh b/install/mail-archiver-install.sh index d4dfc839c..603033402 100644 --- a/install/mail-archiver-install.sh +++ b/install/mail-archiver-install.sh @@ -68,7 +68,7 @@ Restart=always WantedBy=multi-user.target EOF systemctl enable -q --now mail-archiver -msg_info "Created Service" +msg_ok "Created Service" motd_ssh customize diff --git a/install/paperclip-install.sh b/install/paperclip-install.sh index f37e63515..25885cf8b 100644 --- a/install/paperclip-install.sh +++ b/install/paperclip-install.sh @@ -100,7 +100,7 @@ for PAPERCLIP_ONBOARD_CMD in \ if ! grep -q "unknown option '--bind'" "$PAPERCLIP_ONBOARD_LOG"; then break fi - msg_info "Retrying Paperclip Onboarding" + msg_warn "Retrying Paperclip Onboarding" done if [[ ! -f "$PAPERCLIP_CONFIG" ]]; then @@ -127,7 +127,7 @@ EOF msg_warn "Paperclip authenticated mode is enabled, but no CEO invite was generated automatically" fi else - msg_info "Paperclip Bootstrapped in Local Trusted Mode" + msg_ok "Running in local trusted mode" fi rm -f "$PAPERCLIP_ONBOARD_LOG" "$PAPERCLIP_BOOTSTRAP_LOG" msg_ok "Bootstrapped Paperclip" diff --git a/install/plant-it-install.sh b/install/plant-it-install.sh index 8a284baab..bf26d95da 100644 --- a/install/plant-it-install.sh +++ b/install/plant-it-install.sh @@ -25,7 +25,7 @@ JAVA_VERSION="21" setup_java USE_ORIGINAL_FILENAME="true" fetch_and_deploy_gh_release "plant-it" "MDeLuise/plant-it" "singlefile" "0.10.0" "/opt/plant-it/backend" "server.jar" fetch_and_deploy_gh_release "plant-it-front" "MDeLuise/plant-it" "prebuild" "0.10.0" "/opt/plant-it/frontend" "client.tar.gz" -msg_info "Configured Plant-it" +msg_info "Configuring Plant-it" JWT_SECRET=$(openssl rand -base64 24 | tr -d '/+=') mkdir -p /opt/plant-it-data cat </opt/plant-it/backend/server.env diff --git a/install/podman-homeassistant-install.sh b/install/podman-homeassistant-install.sh index 03fb87b4d..7b8f81563 100644 --- a/install/podman-homeassistant-install.sh +++ b/install/podman-homeassistant-install.sh @@ -16,7 +16,7 @@ update_os PORTAINER_LATEST_VERSION=$(get_latest_github_release "portainer/portainer") PORTAINER_AGENT_LATEST_VERSION=$(get_latest_github_release "portainer/agent") -if $STD mount | grep 'on / type zfs' >null && echo "ZFS"; then +if $STD mount | grep 'on / type zfs' >/dev/null && echo "ZFS"; then msg_info "Enabling ZFS support." mkdir -p /etc/containers cat <<'EOF' >/usr/local/bin/overlayzfsmount @@ -37,6 +37,7 @@ mount_program = "/usr/local/bin/overlayzfsmount" [storage.options.overlay] mountopt = "nodev" EOF + msg_ok "Enabled ZFS support" fi msg_info "Installing Podman" diff --git a/install/podman-install.sh b/install/podman-install.sh index 6e1cd58c2..64fe3ef97 100644 --- a/install/podman-install.sh +++ b/install/podman-install.sh @@ -16,7 +16,7 @@ update_os PORTAINER_LATEST_VERSION=$(get_latest_github_release "portainer/portainer") PORTAINER_AGENT_LATEST_VERSION=$(get_latest_github_release "portainer/agent") -if $STD mount | grep 'on / type zfs' >null && echo "ZFS"; then +if $STD mount | grep 'on / type zfs' >/dev/null && echo "ZFS"; then msg_info "Enabling ZFS support." mkdir -p /etc/containers cat <<'EOF' >/usr/local/bin/overlayzfsmount @@ -37,6 +37,7 @@ mount_program = "/usr/local/bin/overlayzfsmount" [storage.options.overlay] mountopt = "nodev" EOF + msg_ok "Enabled ZFS support" fi msg_info "Installing Podman" diff --git a/install/searxng-install.sh b/install/searxng-install.sh index ad38297b2..68ef88ec8 100644 --- a/install/searxng-install.sh +++ b/install/searxng-install.sh @@ -93,7 +93,7 @@ chown searxng:searxng /etc/searxng/settings.yml chmod 640 /etc/searxng/settings.yml msg_ok "Configured settings" -msg_info "Set up web services" +msg_info "Setting up web services" cat </etc/systemd/system/searxng.service [Unit] Description=SearXNG service diff --git a/install/sportarr-install.sh b/install/sportarr-install.sh index aedb4a7d1..bb8d35901 100644 --- a/install/sportarr-install.sh +++ b/install/sportarr-install.sh @@ -48,7 +48,7 @@ Restart=always WantedBy=multi-user.target EOF systemctl enable -q --now sportarr -msg_info "Created Service" +msg_ok "Created Service" motd_ssh customize diff --git a/tools/addon/add-netbird-lxc.sh b/tools/addon/add-netbird-lxc.sh index 9fc8a08d4..9cfd31cdf 100644 --- a/tools/addon/add-netbird-lxc.sh +++ b/tools/addon/add-netbird-lxc.sh @@ -70,7 +70,6 @@ if [[ "$LXC_STATUS" != "running" ]]; then msg_info "Container $CTID is not running. Starting it now..." pct start "$CTID" while [[ "$(pct status "$CTID" | awk '{print $2}')" != "running" ]]; do - msg_info "Waiting for the container to start..." sleep 2 done msg_ok "Container $CTID is now running." diff --git a/tools/addon/add-tailscale-lxc.sh b/tools/addon/add-tailscale-lxc.sh index 8549b7b16..6d83b4d1c 100644 --- a/tools/addon/add-tailscale-lxc.sh +++ b/tools/addon/add-tailscale-lxc.sh @@ -56,8 +56,7 @@ while read -r line; do ((${#ITEM} + OFFSET > MSG_MAX_LENGTH)) && MSG_MAX_LENGTH=$((${#ITEM} + OFFSET)) CTID_MENU+=("$TAG" "$ITEM" "OFF") done < <(pct list | awk 'NR>1') - -stop_spinner +msg_ok "Loaded container list" CTID="" while [[ -z "${CTID}" ]]; do CTID=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "Containers on $NODE" --radiolist \ diff --git a/tools/addon/phpmyadmin.sh b/tools/addon/phpmyadmin.sh index 3355c7e44..607e916c1 100644 --- a/tools/addon/phpmyadmin.sh +++ b/tools/addon/phpmyadmin.sh @@ -141,6 +141,7 @@ function install_phpmyadmin() { mkdir -p "$INSTALL_DIR" tar xf "$tarball" --strip-components=1 -C "$INSTALL_DIR" rm -f "$tarball" + msg_ok "Downloaded phpMyAdmin ${LATEST_VERSION}" } function configure_phpmyadmin() { @@ -210,12 +211,12 @@ function uninstall_phpmyadmin() { $STD rc-service lighttpd stop $STD rc-service php-fpm stop fi + msg_ok "Stopped Webserver" msg_info "Removing phpMyAdmin directory" rm -rf "$INSTALL_DIR" if [[ "$OS" == "Alpine" ]]; then - msg_info "Removing Lighttpd config" rm -f /etc/lighttpd/lighttpd.conf $STD rc-service php-fpm restart $STD rc-service lighttpd restart diff --git a/tools/pve/update-apps.sh b/tools/pve/update-apps.sh index 3944dd9d1..90257dc04 100644 --- a/tools/pve/update-apps.sh +++ b/tools/pve/update-apps.sh @@ -654,12 +654,11 @@ for container in $CHOICE; do log_write "Container $container ($service): FAILED — no backup found for restore" exit 235 fi - msg_info "Restoring from: $BACKUP_ENTRY" pct restore $container "$BACKUP_ENTRY" --storage $LXC_STORAGE --force >/dev/null 2>&1 restorestatus=$? if [ $restorestatus -eq 0 ]; then pct start $container - msg_ok "Container $container successfully restored from backup" + msg_ok "Container $container restored from ${BACKUP_ENTRY}" log_result "$container" "$service" "RESTORED" "Update failed (exit $exit_code) — restored from backup" log_write "Container $container ($service): RESTORED from $BACKUP_ENTRY" else