From 34d1c7693d7f75236474bcdeeca1659a0a98b09a Mon Sep 17 00:00:00 2001 From: "CanbiZ (MickLesk)" <47820557+MickLesk@users.noreply.github.com> Date: Mon, 16 Mar 2026 17:12:33 +0100 Subject: [PATCH] fixes --- ct/isponsorblocktv.sh | 24 ++------------- install/isponsorblocktv-install.sh | 49 ++++++------------------------ 2 files changed, 12 insertions(+), 61 deletions(-) diff --git a/ct/isponsorblocktv.sh b/ct/isponsorblocktv.sh index f328d90e..50316690 100644 --- a/ct/isponsorblocktv.sh +++ b/ct/isponsorblocktv.sh @@ -2,7 +2,7 @@ source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVED/main/misc/build.func) # Copyright (c) 2021-2026 community-scripts ORG -# Author: Matthew Stern (sternma) +# Author: Matthew Stern (sternma) | MickLesk (CanbiZ) # License: MIT | https://github.com/community-scripts/ProxmoxVED/raw/main/LICENSE # Source: https://github.com/dmunozv04/iSponsorBlockTV @@ -35,27 +35,7 @@ function update_script() { systemctl stop isponsorblocktv msg_ok "Stopped Service" - if [[ -d /var/lib/isponsorblocktv ]]; then - msg_info "Backing up Data" - cp -r /var/lib/isponsorblocktv /var/lib/isponsorblocktv_data_backup - msg_ok "Backed up Data" - fi - - CLEAN_INSTALL=1 fetch_and_deploy_gh_release "isponsorblocktv" "dmunozv04/iSponsorBlockTV" - - msg_info "Setting up iSponsorBlockTV" - $STD python3 -m venv /opt/isponsorblocktv/venv - $STD /opt/isponsorblocktv/venv/bin/pip install --upgrade pip - $STD /opt/isponsorblocktv/venv/bin/pip install /opt/isponsorblocktv - msg_ok "Set up iSponsorBlockTV" - - if [[ -d /var/lib/isponsorblocktv_data_backup ]]; then - msg_info "Restoring Data" - rm -rf /var/lib/isponsorblocktv - cp -r /var/lib/isponsorblocktv_data_backup /var/lib/isponsorblocktv - rm -rf /var/lib/isponsorblocktv_data_backup - msg_ok "Restored Data" - fi + CLEAN_INSTALL=1 fetch_and_deploy_gh_release "isponsorblocktv" "dmunozv04/iSponsorBlockTV" "singlefile" "latest" "/opt/isponsorblocktv" "iSponsorBlockTV-*-linux" msg_info "Starting Service" systemctl start isponsorblocktv diff --git a/install/isponsorblocktv-install.sh b/install/isponsorblocktv-install.sh index 676b756b..29ef9417 100644 --- a/install/isponsorblocktv-install.sh +++ b/install/isponsorblocktv-install.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash # Copyright (c) 2021-2026 community-scripts ORG -# Author: Matthew Stern (sternma) +# Author: Matthew Stern (sternma) | MickLesk (CanbiZ) # License: MIT | https://github.com/community-scripts/ProxmoxVED/raw/main/LICENSE # Source: https://github.com/dmunozv04/iSponsorBlockTV @@ -13,30 +13,14 @@ setting_up_container network_check update_os -INSTALL_DIR="/opt/isponsorblocktv" -DATA_DIR="/var/lib/isponsorblocktv" - -msg_info "Installing Dependencies" -$STD apt install -y \ - python3 \ - python3-venv \ - python3-pip -msg_ok "Installed Dependencies" - -fetch_and_deploy_gh_release "isponsorblocktv" "dmunozv04/iSponsorBlockTV" +fetch_and_deploy_gh_release "isponsorblocktv" "dmunozv04/iSponsorBlockTV" "singlefile" "latest" "/opt/isponsorblocktv" "iSponsorBlockTV-*-linux" msg_info "Setting up iSponsorBlockTV" -$STD python3 -m venv "$INSTALL_DIR/venv" -$STD "$INSTALL_DIR/venv/bin/pip" install --upgrade pip -$STD "$INSTALL_DIR/venv/bin/pip" install "$INSTALL_DIR" +install -d /var/lib/isponsorblocktv msg_ok "Set up iSponsorBlockTV" -msg_info "Creating data directory" -install -d "$DATA_DIR" -msg_ok "Created data directory" - msg_info "Creating Service" -cat </etc/systemd/system/isponsorblocktv.service +cat </etc/systemd/system/isponsorblocktv.service [Unit] Description=iSponsorBlockTV After=network-online.target @@ -46,26 +30,24 @@ Wants=network-online.target Type=simple User=root Group=root -WorkingDirectory=$INSTALL_DIR -Environment=iSPBTV_data_dir=$DATA_DIR -ExecStart=$INSTALL_DIR/venv/bin/iSponsorBlockTV +Environment=iSPBTV_data_dir=/var/lib/isponsorblocktv +ExecStart=/opt/isponsorblocktv/isponsorblocktv Restart=on-failure RestartSec=5 [Install] WantedBy=multi-user.target -EOT +EOF systemctl enable -q isponsorblocktv msg_ok "Created Service" msg_info "Creating CLI wrapper" -install -d /usr/local/bin -cat <<'EOT' >/usr/local/bin/iSponsorBlockTV +cat </usr/local/bin/iSponsorBlockTV #!/usr/bin/env bash export iSPBTV_data_dir="/var/lib/isponsorblocktv" set +e -/opt/isponsorblocktv/venv/bin/iSponsorBlockTV "$@" +/opt/isponsorblocktv/isponsorblocktv "$@" status=$? set -e @@ -76,22 +58,11 @@ case "${1:-}" in esac exit $status -EOT +EOF chmod +x /usr/local/bin/iSponsorBlockTV ln -sf /usr/local/bin/iSponsorBlockTV /usr/bin/iSponsorBlockTV msg_ok "Created CLI wrapper" -msg_info "Setting default data dir for shells" -cat <<'EOT' >/etc/profile.d/isponsorblocktv.sh -export iSPBTV_data_dir="/var/lib/isponsorblocktv" -EOT -if ! grep -q '^iSPBTV_data_dir=' /etc/environment 2>/dev/null; then - cat <<'EOT' >>/etc/environment -iSPBTV_data_dir=/var/lib/isponsorblocktv -EOT -fi -msg_ok "Set default data dir for shells" - motd_ssh customize cleanup_lxc