From 0edc72043e3b59a1be797c007d2848493c98ab41 Mon Sep 17 00:00:00 2001
From: jp112sdl <jp112sdl@icloud.com>
Date: Mon, 27 Jun 2022 12:10:48 +0200
Subject: [PATCH] fix for patch revoke older addon version

---
 src/rc.d/jp-hb-devices-addon | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/rc.d/jp-hb-devices-addon b/src/rc.d/jp-hb-devices-addon
index 50d2fef9..3f0f6ba2 100755
--- a/src/rc.d/jp-hb-devices-addon
+++ b/src/rc.d/jp-hb-devices-addon
@@ -21,7 +21,7 @@ RL_FILE=/lib/udev/rules.d/99-hmip-rfusb.rules
 CK_FIRMWARE_FILE=${FIRMWARE_DIR}/hb-uni-sen-cap-moist.xml
 
 PATCHSUBDIR_COMMON=common
-PATCHSUBDIR_VERSION=le_363
+
 check_ccu_fw_version()
 {
  model=`grep VERSION /boot/VERSION   | awk -F'[=.]' {'print $2'}`
@@ -35,6 +35,8 @@ check_ccu_fw_version()
  
  if [ $model -ge 2 ] && [ $version -ge 65 ]; then
   PATCHSUBDIR_VERSION=ge_365
+ else
+  PATCHSUBDIR_VERSION=le_363
  fi
  
  echo "Found firmware version $model.$version.$build - using patch subdirectory version ${PATCHSUBDIR_VERSION}" | tee -a $TMP_LOGFILE | tee -a $TMP_ERRFILE
@@ -156,9 +158,16 @@ case "$1" in
         
         ### revoke patches from currently installed addon version
         if [ -f ${CK_FIRMWARE_FILE} ] && [ -d ${PATCH_DIR} ]; then
-            currentversion=`cat ${ADDON_DIR}/VERSION`
-            echo "Revoking current addon V $currentversion patch files." | tee $TMP_LOGFILE | tee $TMP_ERRFILE
+            currentversion_major=`cat /usr/local/addons/jp-hb-devices-addon/VERSION | awk -F'[=.]' {'print $1'}`
+            currentversion_minor=`cat /usr/local/addons/jp-hb-devices-addon/VERSION | awk -F'[=.]' {'print $2'}`
+
+            if [ $currentversion_major -eq 5 ]; then
+              PATCHSUBDIR_VERSION=ge_345
+            fi
+
+            echo "Revoking current addon V $currentversion_major.$currentversion_minor patch files." | tee $TMP_LOGFILE | tee $TMP_ERRFILE
             patcher "REVOKE"
+            check_ccu_fw_version
         fi
         
         ### delete the old (current) addon directory and rename the newly uploaded