remove old symlinks with install (#131)

* change install to location
* install script will remove old sylinks

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

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

etc/dbus-serialbattery/installlocal.sh

@@ -1,3 +1,3 @@
 #!/bin/sh
 tar -zxf ./venus-data.tar.gz -C /data
-sh /data/rc.local
+sh /data/etc/dbus-serialbattery/reinstalllocal.sh

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
+sh /data/etc/dbus-serialbattery/reinstalllocal.sh

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
+
+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

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):

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

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
+exec /data/etc/dbus-serialbattery/reinstalllocal.sh