evcc 0.130.12

Signed-off-by: openhabian <openhabian@openHABian>
mstormi · Sep 23, 2024 · 4dc11a1 · 4dc11a1
1 parent 2c06740
commit 4dc11a1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/build-image/openhabian.conf b/build-image/openhabian.conf
@@ -122,7 +122,7 @@ tstags=tag:smarthouse
 
 # storm.house EMS settings
 openhabpkgversion=4.2.1-1
-evccpkgversion=0.130.7
+evccpkgversion=0.130.12
 tarifftype=entsoe
 basetariff=16.45
 tariffhomeid=aaaa-bbbb-cccc

diff --git a/functions/menu.bash b/functions/menu.bash
@@ -80,7 +80,7 @@ show_main_menu() {
     fi
     repo=$(apt-cache madison openhab | head -n 1 | awk '{ print $6 }' |cut -d'/' -f1)
     cond_redirect apt-mark unhold openhab openhab-addons evcc
-    if ! cond_redirect apt install -y --allow-downgrades evcc="${evccForcePkg:-${evccpkgversion:-0.130.7}}"; then echo "FAILED (EVCC package installation)"; return 1; fi
+    if ! cond_redirect apt install -y --allow-downgrades evcc="${evccForcePkg:-${evccpkgversion}}"; then echo "FAILED (EVCC package installation)"; return 1; fi
     openhab_setup "openHAB" "${repo:-release}" "${openhabForcePkg:-${openhabpkgversion:-4.2.1-1}}"
     upgrade_ems
     cond_redirect apt-mark hold openhab openhab-addons evcc

diff --git a/functions/packages.bash b/functions/packages.bash
@@ -755,7 +755,7 @@ install_evcc() {
   ( echo "deb ${repotxt}"; echo "deb-src ${repotxt}" ) > $repo
   echo -n "$(timestamp) [openHABian] Installing EVCC... "
   cond_redirect apt update -o DPkg::Lock::Timeout="$APTTIMEOUT"
-  if ! cond_redirect apt install -y "evcc=${2:-0.130.7}"; then echo "FAILED (EVCC package installation)"; return 1; fi
+  if ! cond_redirect apt install -y "evcc=${2:-${evccForcePkg:-${evccpkgversion}}}"; then echo "FAILED (EVCC package installation)"; return 1; fi
 
   mkdir "$svcdir"
   if [[ $(systemctl show -pUser evcc | cut -d= -f2) == "${username:-openhabian}" ]]; then