From 91df16885aeb050e10da1d28dd3fdc27af71a6bf Mon Sep 17 00:00:00 2001 From: Louis Van Der Walt <26077665+Louisvdw@users.noreply.github.com> Date: Sun, 12 Jun 2022 18:31:37 +0200 Subject: [PATCH] remove old symlinks with install (#131) * change install to location * install script will remove old sylinks --- buildfiles.lst | 1 + create_build.sh | 4 +-- etc/dbus-serialbattery/installlocal.sh | 2 +- etc/dbus-serialbattery/installrelease.sh | 2 +- etc/dbus-serialbattery/reinstalllocal.sh | 39 +++++++++++++++++++++--- etc/dbus-serialbattery/renogy.py | 1 - etc/dbus-serialbattery/utils.py | 2 +- rc.local | 3 +- 8 files changed, 42 insertions(+), 12 deletions(-) diff --git a/buildfiles.lst b/buildfiles.lst index a5950bc5..340aa6c0 100644 --- a/buildfiles.lst +++ b/buildfiles.lst @@ -8,6 +8,7 @@ etc/dbus-serialbattery/start-serialbattery.sh etc/dbus-serialbattery/disabledriver.sh etc/dbus-serialbattery/installlocal.sh etc/dbus-serialbattery/installrelease.sh +etc/dbus-serialbattery/reinstalllocal.sh etc/dbus-serialbattery/dbus-serialbattery.py etc/dbus-serialbattery/dbushelper.py etc/dbus-serialbattery/battery.py diff --git a/create_build.sh b/create_build.sh index d88af462..ee182e8c 100644 --- a/create_build.sh +++ b/create_build.sh @@ -1,3 +1,3 @@ #!/bin/sh -dos2unix rc.local conf/serial-starter.d etc/dbus-serialbattery/service/run etc/dbus-serialbattery/service/log/run etc/dbus-serialbattery/LICENSE etc/dbus-serialbattery/README.md etc/dbus-serialbattery/start-serialbattery.sh etc/dbus-serialbattery/disabledriver.sh etc/dbus-serialbattery/installlocal.sh etc/dbus-serialbattery/installrelease.sh etc/dbus-serialbattery/dbus-serialbattery.py etc/dbus-serialbattery/dbushelper.py etc/dbus-serialbattery/battery.py etc/dbus-serialbattery/utils.py etc/dbus-serialbattery/lltjbd.py etc/dbus-serialbattery/daly.py etc/dbus-serialbattery/ant.py etc/dbus-serialbattery/util_max17853.py etc/dbus-serialbattery/mnb.py etc/dbus-serialbattery/jkbms.py etc/dbus-serialbattery/sinowealth.py etc/dbus-serialbattery/renogy.py etc/dbus-serialbattery/revov.py -tar -czvf venus-data.tar.gz --mode='a+rwX' rc.local conf/serial-starter.d etc/dbus-serialbattery/service/run etc/dbus-serialbattery/service/log/run etc/dbus-serialbattery/LICENSE etc/dbus-serialbattery/README.md etc/dbus-serialbattery/start-serialbattery.sh etc/dbus-serialbattery/disabledriver.sh etc/dbus-serialbattery/installlocal.sh etc/dbus-serialbattery/installrelease.sh etc/dbus-serialbattery/dbus-serialbattery.py etc/dbus-serialbattery/dbushelper.py etc/dbus-serialbattery/battery.py etc/dbus-serialbattery/utils.py etc/dbus-serialbattery/lltjbd.py etc/dbus-serialbattery/daly.py etc/dbus-serialbattery/ant.py etc/dbus-serialbattery/util_max17853.py etc/dbus-serialbattery/mnb.py etc/dbus-serialbattery/jkbms.py etc/dbus-serialbattery/sinowealth.py etc/dbus-serialbattery/renogy.py etc/dbus-serialbattery/revov.py +dos2unix rc.local conf/serial-starter.d etc/dbus-serialbattery/service/run etc/dbus-serialbattery/service/log/run etc/dbus-serialbattery/LICENSE etc/dbus-serialbattery/README.md etc/dbus-serialbattery/start-serialbattery.sh etc/dbus-serialbattery/disabledriver.sh etc/dbus-serialbattery/installlocal.sh etc/dbus-serialbattery/installrelease.sh etc/dbus-serialbattery/reinstalllocal.sh etc/dbus-serialbattery/dbus-serialbattery.py etc/dbus-serialbattery/dbushelper.py etc/dbus-serialbattery/battery.py etc/dbus-serialbattery/utils.py etc/dbus-serialbattery/lltjbd.py etc/dbus-serialbattery/daly.py etc/dbus-serialbattery/ant.py etc/dbus-serialbattery/util_max17853.py etc/dbus-serialbattery/mnb.py etc/dbus-serialbattery/jkbms.py etc/dbus-serialbattery/sinowealth.py etc/dbus-serialbattery/renogy.py etc/dbus-serialbattery/revov.py +tar -czvf venus-data.tar.gz --mode='a+rwX' rc.local conf/serial-starter.d etc/dbus-serialbattery/service/run etc/dbus-serialbattery/service/log/run etc/dbus-serialbattery/LICENSE etc/dbus-serialbattery/README.md etc/dbus-serialbattery/start-serialbattery.sh etc/dbus-serialbattery/disabledriver.sh etc/dbus-serialbattery/installlocal.sh etc/dbus-serialbattery/installrelease.sh etc/dbus-serialbattery/reinstalllocal.sh etc/dbus-serialbattery/dbus-serialbattery.py etc/dbus-serialbattery/dbushelper.py etc/dbus-serialbattery/battery.py etc/dbus-serialbattery/utils.py etc/dbus-serialbattery/lltjbd.py etc/dbus-serialbattery/daly.py etc/dbus-serialbattery/ant.py etc/dbus-serialbattery/util_max17853.py etc/dbus-serialbattery/mnb.py etc/dbus-serialbattery/jkbms.py etc/dbus-serialbattery/sinowealth.py etc/dbus-serialbattery/renogy.py etc/dbus-serialbattery/revov.py diff --git a/etc/dbus-serialbattery/installlocal.sh b/etc/dbus-serialbattery/installlocal.sh index 724ceada..b389ccd2 100644 --- a/etc/dbus-serialbattery/installlocal.sh +++ b/etc/dbus-serialbattery/installlocal.sh @@ -1,3 +1,3 @@ #!/bin/sh tar -zxf ./venus-data.tar.gz -C /data -sh /data/rc.local \ No newline at end of file +sh /data/etc/dbus-serialbattery/reinstalllocal.sh \ No newline at end of file diff --git a/etc/dbus-serialbattery/installrelease.sh b/etc/dbus-serialbattery/installrelease.sh index db25451a..79ebf10a 100644 --- a/etc/dbus-serialbattery/installrelease.sh +++ b/etc/dbus-serialbattery/installrelease.sh @@ -1,4 +1,4 @@ #!/bin/sh curl -s https://api.github.com/repos/Louisvdw/dbus-serialbattery/releases/latest | grep "browser_download_url.*gz" | cut -d : -f 2,3 | tr -d \" | wget -O venus-data.tar.gz -qi - tar -zxf ./venus-data.tar.gz -C /data -sh /data/rc.local \ No newline at end of file +sh /data/etc/dbus-serialbattery/reinstalllocal.sh \ No newline at end of file diff --git a/etc/dbus-serialbattery/reinstalllocal.sh b/etc/dbus-serialbattery/reinstalllocal.sh index 9e467bd6..c648e5eb 100644 --- a/etc/dbus-serialbattery/reinstalllocal.sh +++ b/etc/dbus-serialbattery/reinstalllocal.sh @@ -1,5 +1,36 @@ #!/bin/sh -mkdir /opt/victronenergy/dbus-serialbattery -mkdir /opt/victronenergy/service-templates/dbus-serialbattery -cp /data/etc/dbus-serialbattery/* /opt/victronenergy/dbus-serialbattery -cp -r /data/etc/dbus-serialbattery/service/* /opt/victronenergy/service-templates/dbus-serialbattery \ No newline at end of file + +DRIVER=/opt/victronenergy/dbus-serialbattery +RUN=/opt/victronenergy/service-templates/dbus-serialbattery +OLD=/opt/victronenergy/service/dbus-serialbattery +if [ -d "$DRIVER" ]; then + if [ -L "$DRIVER" ]; then + # Remove old SymLink. + rm "$DRIVER" + # Create as folder + mkdir "$DRIVER" + fi +else + # Create folder + mkdir "$DRIVER" +fi +if [ -d "$RUN" ]; then + if [ -L "$RUN" ]; then + # Remove old SymLink. + rm "$RUN" + # Create as folder + mkdir "$RUN" + fi +else + # Create folder + mkdir "$RUN" +fi +if [ -d "$OLD" ]; then + if [ -L "$OLD" ]; then + # Remove old SymLink. + rm "$RUN" + fi +fi + +cp -f /data/etc/dbus-serialbattery/* /opt/victronenergy/dbus-serialbattery +cp -rf /data/etc/dbus-serialbattery/service/* /opt/victronenergy/service-templates/dbus-serialbattery \ No newline at end of file diff --git a/etc/dbus-serialbattery/renogy.py b/etc/dbus-serialbattery/renogy.py index 59677c22..a9a0eb85 100644 --- a/etc/dbus-serialbattery/renogy.py +++ b/etc/dbus-serialbattery/renogy.py @@ -2,7 +2,6 @@ from __future__ import absolute_import, division, print_function, unicode_literals from battery import Protection, Battery, Cell from utils import * -from struct import * import struct class RenogyCell(Cell): diff --git a/etc/dbus-serialbattery/utils.py b/etc/dbus-serialbattery/utils.py index c12d9fa7..8af8e8cf 100644 --- a/etc/dbus-serialbattery/utils.py +++ b/etc/dbus-serialbattery/utils.py @@ -12,7 +12,7 @@ # Constants - Need to dynamically get them in future DRIVER_VERSION = 0.11 -DRIVER_SUBVERSION = 'b3' +DRIVER_SUBVERSION = 'b4' zero_char = chr(48) degree_sign = u'\N{DEGREE SIGN}' # Cell min/max voltages - used with the cell count to get the min/max battery voltage diff --git a/rc.local b/rc.local index ccec6598..74ac4635 100644 --- a/rc.local +++ b/rc.local @@ -1,3 +1,2 @@ #!/bin/bash -ln -sfn /data/etc/dbus-serialbattery /opt/victronenergy/dbus-serialbattery -ln -sfn /data/etc/dbus-serialbattery/service /opt/victronenergy/service-templates/dbus-serialbattery \ No newline at end of file +exec /data/etc/dbus-serialbattery/reinstalllocal.sh