Skip to content

Commit 02945a4

Browse files
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 <[email protected]>
1 parent 00a7f5f commit 02945a4

File tree

2 files changed

+17
-14
lines changed

2 files changed

+17
-14
lines changed

ct/evcc.sh

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,18 @@ function update_script() {
2323
header_info
2424
check_container_storage
2525
check_container_resources
26-
if [[ ! -f /etc/apt/sources.list.d/evcc-stable.list ]]; then
26+
if ! command -v evcc >/dev/null 2>&1; then
2727
msg_error "No ${APP} Installation Found!"
28-
exit
28+
exit 1
2929
fi
30+
31+
if [[ -f /etc/apt/sources.list.d/evcc-stable.list ]]; then
32+
setup_deb822_repo \
33+
"evcc-stable" \
34+
"https://dl.evcc.io/public/evcc/stable/gpg.EAD5D0E07B0EC0FD.key" \
35+
"https://dl.evcc.io/public/evcc/stable/deb/debian/" \
36+
"$(get_os_info codename)" \
37+
"main"
3038
msg_info "Updating evcc LXC"
3139
$STD apt update
3240
$STD apt --only-upgrade install -y evcc

install/evcc-install.sh

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,13 @@ setting_up_container
1414
network_check
1515
update_os
1616

17-
msg_info "Installing Dependencies"
18-
$STD apt-get install -y \
19-
lsb-release
20-
msg_ok "Installed Dependencies"
21-
2217
msg_info "Setting up evcc Repository"
23-
curl -fsSL https://dl.evcc.io/public/evcc/stable/gpg.EAD5D0E07B0EC0FD.key | gpg --dearmor -o /etc/apt/keyrings/evcc-stable.gpg
24-
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
18+
setup_deb822_repo \
19+
"evcc-stable" \
20+
"https://dl.evcc.io/public/evcc/stable/gpg.EAD5D0E07B0EC0FD.key" \
21+
"https://dl.evcc.io/public/evcc/stable/deb/debian/" \
22+
"$(get_os_info codename)" \
23+
"main"
2524
$STD apt update
2625
msg_ok "evcc Repository setup sucessfully"
2726

@@ -32,8 +31,4 @@ msg_ok "Installed evcc"
3231

3332
motd_ssh
3433
customize
35-
36-
msg_info "Cleaning up"
37-
$STD apt-get -y autoremove
38-
$STD apt-get -y autoclean
39-
msg_ok "Cleaned"
34+
cleanup_lxc

0 commit comments

Comments
 (0)