From 02945a44559d54159b0ed22c6cb4a5ae58aac408 Mon Sep 17 00:00:00 2001 From: Tobias <96661824+CrazyWolf13@users.noreply.github.com> Date: Wed, 12 Nov 2025 08:54:46 +0100 Subject: [PATCH] chore: evcc: refactor (#9057) * chore: evcc: refactor * chore: evcc: update to deb822 * fix * update * fix * fix * Fix version codename retrieval in evcc.sh * Fix version codename retrieval in install script * Remove installation of lsb-release dependency Removed dependency installation for lsb-release. --------- Co-authored-by: CanbiZ <47820557+MickLesk@users.noreply.github.com> --- ct/evcc.sh | 12 ++++++++++-- install/evcc-install.sh | 19 +++++++------------ 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/ct/evcc.sh b/ct/evcc.sh index 3bd866bd0..b01054077 100644 --- a/ct/evcc.sh +++ b/ct/evcc.sh @@ -23,10 +23,18 @@ function update_script() { header_info check_container_storage check_container_resources - if [[ ! -f /etc/apt/sources.list.d/evcc-stable.list ]]; then + if ! command -v evcc >/dev/null 2>&1; then msg_error "No ${APP} Installation Found!" - exit + exit 1 fi + + if [[ -f /etc/apt/sources.list.d/evcc-stable.list ]]; then + setup_deb822_repo \ + "evcc-stable" \ + "https://dl.evcc.io/public/evcc/stable/gpg.EAD5D0E07B0EC0FD.key" \ + "https://dl.evcc.io/public/evcc/stable/deb/debian/" \ + "$(get_os_info codename)" \ + "main" msg_info "Updating evcc LXC" $STD apt update $STD apt --only-upgrade install -y evcc diff --git a/install/evcc-install.sh b/install/evcc-install.sh index afca90fa9..73bcb65ef 100644 --- a/install/evcc-install.sh +++ b/install/evcc-install.sh @@ -14,14 +14,13 @@ setting_up_container network_check update_os -msg_info "Installing Dependencies" -$STD apt-get install -y \ - lsb-release -msg_ok "Installed Dependencies" - msg_info "Setting up evcc Repository" -curl -fsSL https://dl.evcc.io/public/evcc/stable/gpg.EAD5D0E07B0EC0FD.key | gpg --dearmor -o /etc/apt/keyrings/evcc-stable.gpg -echo "deb [signed-by=/etc/apt/keyrings/evcc-stable.gpg] https://dl.evcc.io/public/evcc/stable/deb/debian $(lsb_release -cs) main" >/etc/apt/sources.list.d/evcc-stable.list +setup_deb822_repo \ + "evcc-stable" \ + "https://dl.evcc.io/public/evcc/stable/gpg.EAD5D0E07B0EC0FD.key" \ + "https://dl.evcc.io/public/evcc/stable/deb/debian/" \ + "$(get_os_info codename)" \ + "main" $STD apt update msg_ok "evcc Repository setup sucessfully" @@ -32,8 +31,4 @@ msg_ok "Installed evcc" motd_ssh customize - -msg_info "Cleaning up" -$STD apt-get -y autoremove -$STD apt-get -y autoclean -msg_ok "Cleaned" +cleanup_lxc