From ffdf6b132c815e0e0565fe555a54bb6fa8fa9157 Mon Sep 17 00:00:00 2001 From: bilulib Date: Sat, 17 May 2025 17:45:35 +0200 Subject: [PATCH] general fix --- ct/huntarr.sh | 28 ++++++++++++++-------------- install/huntarr-install.sh | 8 +++++--- 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/ct/huntarr.sh b/ct/huntarr.sh index 36f1760..94d162c 100644 --- a/ct/huntarr.sh +++ b/ct/huntarr.sh @@ -24,42 +24,42 @@ function update_script() { check_container_storage check_container_resources - if [[ ! -f /opt/${APPLICATION}/main.py ]]; then - msg_error "No ${APPLICATION} Installation Found!" + if [[ ! -f /opt/huntarr/main.py ]]; then + msg_error "No ${APPLICATIONLICATION} Installation Found!" exit fi RELEASE=$(curl -fsSL https://api.github.com/repos/plexguide/Huntarr.io/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3)}') - if [[ "${RELEASE}" != "$(cat /opt/${APPLICATION}_version.txt)" ]] || [[ ! -f /opt/${APPLICATION}_version.txt ]]; then + if [[ "${RELEASE}" != "$(cat /opt/"${APPLICATION}"_version.txt)" ]] || [[ ! -f /opt/${APPLICATION}_version.txt ]]; then msg_info "Stopping $APPLICATION" - systemctl stop $APPLICATION + systemctl stop huntarr msg_ok "Stopped $APPLICATION" msg_info "Creating Backup" - if ls /opt/${APPLICATION}_backup_*.tar.gz &>/dev/null; then - rm -f /opt/${APPLICATION}_backup_*.tar.gz + if ls /opt/"${APPLICATION}"_backup_*.tar.gz &>/dev/null; then + rm -f /opt/"${APPLICATION}"_backup_*.tar.gz msg_info "Removed previous backup" fi - tar -czf "/opt/${APPLICATION}_backup_$(date +%F).tar.gz" /opt/${APPLICATION} + tar -czf "/opt/${APPLICATION}_backup_$(date +%F).tar.gz" /opt/"${APPLICATION}" msg_ok "Backup Created" msg_info "Updating $APPLICATION to v${RELEASE}" curl -fsSL -o "/opt/${APPLICATION}/${RELEASE}.zip" "https://github.com/plexguide/Huntarr.io/archive/refs/tags/${RELEASE}.zip" unzip -q -o "/opt/${APPLICATION}/${RELEASE}.zip" -d /tmp - cp -rf "/tmp/Huntarr.io-${RELEASE}"/* /opt/${APPLICATION}/ + cp -rf "/tmp/Huntarr.io-${RELEASE}"/* /opt/"${APPLICATION}"/ msg_info "Updating Python dependencies" - cd /opt/${APPLICATION} || exit + cd /opt/"${APPLICATION}" || exit if [[ -f "/opt/${APPLICATION}/.requirements_checksum" ]]; then CURRENT_CHECKSUM=$(md5sum requirements.txt | awk '{print $1}') STORED_CHECKSUM=$(cat .requirements_checksum) if [[ "$CURRENT_CHECKSUM" != "$STORED_CHECKSUM" ]]; then msg_info "Requirements have changed. Performing full upgrade." - uv pip install -r requirements.txt --python /opt/${APPLICATION}/venv/bin/python + uv pip install -r requirements.txt --python /opt/"${APPLICATION}"/venv/bin/python else msg_info "Requirements unchanged. Verifying installation." - uv pip install -r requirements.txt --python /opt/${APPLICATION}/venv/bin/python + uv pip install -r requirements.txt --python /opt/"${APPLICATION}"/venv/bin/python fi else if ! command -v uv &>/dev/null; then @@ -67,14 +67,14 @@ function update_script() { curl -LsSf https://astral.sh/uv/install.sh | sh msg_ok "UV package manager installed" fi - uv pip install -r requirements.txt --python /opt/${APPLICATION}/venv/bin/python + uv pip install -r requirements.txt --python /opt/"${APPLICATION}"/venv/bin/python fi md5sum requirements.txt | awk '{print $1}' >.requirements_checksum msg_ok "Updated Python dependencies" msg_ok "Updated $APPLICATION to v${RELEASE}" msg_info "Starting $APPLICATION" - systemctl start $APPLICATION + systemctl start huntarr msg_ok "Started $APPLICATION" msg_info "Cleaning Up" @@ -82,7 +82,7 @@ function update_script() { rm -rf "/tmp/Huntarr.io-${RELEASE}" msg_ok "Cleanup Completed" - echo "${RELEASE}" >/opt/${APPLICATION}_version.txt + echo "${RELEASE}" >/opt/"${APPLICATION}"_version.txt msg_ok "Update Successful" else msg_ok "No update required. ${APPLICATION} is already at v${RELEASE}" diff --git a/install/huntarr-install.sh b/install/huntarr-install.sh index 03acc15..31aae39 100644 --- a/install/huntarr-install.sh +++ b/install/huntarr-install.sh @@ -21,13 +21,15 @@ $STD apt-get install -y jq msg_ok "Installed Dependencies" msg_info "Installing Python" -$STD apt-get install -y python3 +$STD apt-get install -y \ + python3 \ + python3-venv $STD bash -c "curl -LsSf https://astral.sh/uv/install.sh | sh" export PATH="/root/.local/bin:$HOME/.cargo/bin:$PATH" command -v uv &>/dev/null msg_ok "Installed Python" -msg_info "Setting Up ${APPLICATION}" +msg_info "Setting Up Huntarr" RELEASE=$(curl -fsSL https://api.github.com/repos/plexguide/Huntarr.io/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }') $STD curl -fsSL -o "${RELEASE}.zip" "https://github.com/plexguide/Huntarr.io/archive/refs/tags/${RELEASE}.zip" $STD unzip -q "${RELEASE}.zip" @@ -35,7 +37,7 @@ $STD mv "${REPO_NAME}-${RELEASE}/" "/opt/${APPLICATION}" echo "${RELEASE}" >/opt/${APPLICATION}_version.txt $STD uv venv /opt/${APPLICATION}/venv $STD uv pip install --python /opt/${APPLICATION}/venv/bin/python -r /opt/${APPLICATION}/requirements.txt -msg_ok "Setup ${APPLICATION} Complete" +msg_ok "Setup Huntarr Complete" msg_info "Creating Service" cat </etc/systemd/system/${APPLICATION}.service