fixed serial-starter.d

#520
Louisvdw · Apr 15, 2023 · 9393245 · 9393245
1 parent 256c9ae
commit 9393245
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 11 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -24,7 +24,6 @@ jobs:
             --exclude restartservice.sh \
             --exclude revov.py \
             --exclude test_max17853.py \
-            conf/serial-starter.d \
             etc/dbus-serialbattery/
 
       - name: Release

diff --git a/conf/serial-starter.d b/conf/serial-starter.d
diff --git a/etc/dbus-serialbattery/disabledriver.sh b/etc/dbus-serialbattery/disabledriver.sh
@@ -9,7 +9,7 @@ DRIVERNAME=dbus-serialbattery
 sh /opt/victronenergy/swupdate-scripts/remount-rw.sh
 
 # remove files
-rm -f /data/conf/serial-starter.d
+rm -f /data/conf/serial-starter.d/$DRIVERNAME.conf
 
 # kill if running
 pkill -f "python .*/$DRIVERNAME.py"

diff --git a/etc/dbus-serialbattery/reinstalllocal.sh b/etc/dbus-serialbattery/reinstalllocal.sh
@@ -18,11 +18,24 @@ cp -rf /data/etc/$DRIVERNAME/service /opt/victronenergy/service-templates/$DRIVE
 sh /data/etc/$DRIVERNAME/installqml.sh
 
 # check if serial-starter.d was deleted
-serialstarter=/data/conf/serial-starter.d
-if [ ! -f $serialstarter ]; then
-    echo "service sbattery        dbus-serialbattery" >> $serialstarter
-    echo "alias default gps:vedirect:sbattery" >> $serialstarter
-    echo "alias rs485 cgwacs:fzsonick:imt:modbus:sbattery" >> $serialstarter
+serialstarter_path="/data/conf/serial-starter.d"
+serialstarter_file="$serialstarter_path/dbus-serialbattery.conf"
+
+# check if folder is a file (older versions of this driver)
+if [ -f $serialstarter_path ]; then
+    rm -f $serialstarter_path
+fi
+
+# check if folder exists
+if [ ! -d $serialstarter_path ]; then
+    mkdir $serialstarter_path
+fi
+
+# check if file exists
+if [ ! -f $serialstarter_file ]; then
+    echo "service sbattery        dbus-serialbattery" >> $serialstarter_file
+    echo "alias default gps:vedirect:sbattery" >> $serialstarter_file
+    echo "alias rs485 cgwacs:fzsonick:imt:modbus:sbattery" >> $serialstarter_file
 fi
 
 # restart if running

diff --git a/etc/dbus-serialbattery/uninstall.sh b/etc/dbus-serialbattery/uninstall.sh
@@ -9,7 +9,7 @@ DRIVERNAME=dbus-serialbattery
 sh /opt/victronenergy/swupdate-scripts/remount-rw.sh
 
 # remove files
-rm -f /data/conf/serial-starter.d
+rm -f /data/conf/serial-starter.d/$DRIVERNAME.conf
 rm -rf /opt/victronenergy/service/$DRIVERNAME
 rm -rf /opt/victronenergy/service-templates/$DRIVERNAME
 rm -rf /opt/victronenergy/$DRIVERNAME