From 68215fde79a4c9fc6e2d6c3427dfb498f9259777 Mon Sep 17 00:00:00 2001 From: CanbiZ <47820557+MickLesk@users.noreply.github.com> Date: Mon, 30 Jun 2025 15:44:38 +0200 Subject: [PATCH] fixes --- ct/jellyfin.sh | 45 ------------------------------ ct/librespeed-rust.sh | 18 +++--------- install/librespeed-rust-install.sh | 17 ++--------- 3 files changed, 6 insertions(+), 74 deletions(-) delete mode 100644 ct/jellyfin.sh diff --git a/ct/jellyfin.sh b/ct/jellyfin.sh deleted file mode 100644 index a7763ead..00000000 --- a/ct/jellyfin.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/env bash -source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVED/main/misc/build.func) -# Copyright (c) 2021-2025 tteck -# Author: tteck (tteckster) -# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE -# Source: https://jellyfin.org/ - -APP="Jellyfin" -var_tags="${var_tags:-media}" -var_cpu="${var_cpu:-2}" -var_ram="${var_ram:-2048}" -var_disk="${var_disk:-8}" -var_os="${var_os:-ubuntu}" -var_version="${var_version:-24.04}" -var_unprivileged="${var_unprivileged:-1}" - -header_info "$APP" -variables -color -catch_errors - -function update_script() { - header_info - check_container_storage - check_container_resources - if [[ ! -d /usr/lib/jellyfin ]]; then - msg_error "No ${APP} Installation Found!" - exit - fi - msg_info "Updating ${APP} LXC" - $STD apt-get update - $STD apt-get -y upgrade - $STD apt-get -y --with-new-pkgs upgrade jellyfin jellyfin-server - msg_ok "Updated ${APP} LXC" - exit -} - -start -build_container -description - -msg_ok "Completed Successfully!\n" -echo -e "${CREATING}${GN}${APP} setup has been successfully initialized!${CL}" -echo -e "${INFO}${YW} Access it using the following URL:${CL}" -echo -e "${TAB}${GATEWAY}${BGN}http://${IP}:8096${CL}" diff --git a/ct/librespeed-rust.sh b/ct/librespeed-rust.sh index c6664b5c..292971e2 100644 --- a/ct/librespeed-rust.sh +++ b/ct/librespeed-rust.sh @@ -1,11 +1,11 @@ #!/usr/bin/env bash -source <(curl -s https://raw.githubusercontent.com/community-scripts/ProxmoxVED/main/misc/build.func) +source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVED/main/misc/build.func) # Copyright (c) 2021-2025 community-scripts ORG # Author: Joseph Stubberfield (stubbers) # License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE # Source: https://github.com/librespeed/speedtest-rust -APP="Librespeed Rust" +APP="Librespeed-Rust" var_tags="${var_tags:-network}" var_cpu="${var_cpu:-1}" var_ram="${var_ram:-512}" @@ -28,22 +28,12 @@ function update_script() { exit fi RELEASE=$(curl -fsSL https://api.github.com/repos/librespeed/speedtest-rust/releases/latest | grep '"tag_name"' | sed -E 's/.*"tag_name": "v([^"]+).*/\1/') - if [[ ! -f /opt/${APP}_version.txt ]] || [[ "${RELEASE}" != "$(cat /opt/${APP}_version.txt)" ]]; then + if [[ "${RELEASE}" != "$(cat ~/.librespeed 2>/dev/null)" ]] || [[ ! -f ~/.librespeed ]]; then msg_info "Stopping Services" systemctl stop librespeed-rs msg_ok "Services Stopped" - msg_info "Updating ${APP} to v${RELEASE}" - $STD apt-get update - $STD apt-get -y upgrade - mv /var/lib/librespeed /var/lib/librespeed-backup - temp_file=$(mktemp) - curl -fsSL "https://github.com/librespeed/speedtest-rust/releases/download/v${RELEASE}/librespeed-rs-x86_64-unknown-linux-gnu.deb" -o "$temp_file" - $STD dpkg -u "$temp_file" - rm -rf "$temp_file" - rm -rf /var/lib/librespeed-backup - echo "${RELEASE}" >/opt/"${APPLICATION}"_version.txt - msg_ok "Updated ${APP}" + fetch_and_deploy_gh_release "librespeed-rust" "librespeed/speedtest-rust" "deb" "latest" "/opt/librespeed-rust" "librespeed-rs-x86_64-unknown-linux-gnu.deb" msg_info "Starting Service" systemctl start librespeed-rs diff --git a/install/librespeed-rust-install.sh b/install/librespeed-rust-install.sh index bdba15c5..f056a4ca 100644 --- a/install/librespeed-rust-install.sh +++ b/install/librespeed-rust-install.sh @@ -5,7 +5,6 @@ # License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE # Source: https://github.com/librespeed/speedtest-rust -# Import Functions und Setup source /dev/stdin <<<"$FUNCTIONS_FILE_PATH" color verb_ip6 @@ -14,18 +13,8 @@ setting_up_container network_check update_os -# Setup App -msg_info "Setup ${APPLICATION}" -RELEASE=$(curl -fsSL https://api.github.com/repos/librespeed/speedtest-rust/releases/latest | grep '"tag_name"' | sed -E 's/.*"tag_name": "v([^"]+).*/\1/') -curl -fsSL -o "librespeed-rs-x86_64-unknown-linux-gnu.deb" "https://github.com/librespeed/speedtest-rust/releases/download/v${RELEASE}/librespeed-rs-x86_64-unknown-linux-gnu.deb" -$STD dpkg -i "librespeed-rs-x86_64-unknown-linux-gnu.deb" -# -# -# -echo "${RELEASE}" >/opt/"${APPLICATION}"_version.txt -msg_ok "Setup ${APPLICATION}" +fetch_and_deploy_gh_release "librespeed-rust" "librespeed/speedtest-rust" "deb" "latest" "/opt/librespeed-rust" "librespeed-rs-x86_64-unknown-linux-gnu.deb" -# Enable service msg_info "Enabling Service" systemctl enable -q --now speedtest_rs.service msg_ok "Enabled Service" @@ -33,9 +22,7 @@ msg_ok "Enabled Service" motd_ssh customize -# Cleanup msg_info "Cleaning up" -rm -f "librespeed-rs-x86_64-unknown-linux-gnu.deb" $STD apt-get -y autoremove $STD apt-get -y autoclean -msg_ok "Cleaned" \ No newline at end of file +msg_ok "Cleaned"