Systemd startup

.gitignore

@@ -8,3 +8,6 @@ build-1284/*
 .vscode
 .pio
 *.o
+!build.sh
+!startOpenSprinkler.sh
+!updater.sh

OpenSprinkler.service

@@ -0,0 +1,15 @@
+[Unit]
+Description=OpenSprinkler
+Wants=network-online.target
+After=network.target network-online.target
+
+[Service]
+Type=simple
+Restart=always
+RestartSec=1
+User=root
+WorkingDirectory=__OpenSprinkler_Path__
+ExecStart=/bin/bash -c ./startOpenSprinkler.sh
+
+[Install]
+WantedBy=multi-user.target

build.sh

@@ -63,7 +63,14 @@ else
 	g++ -o OpenSprinkler -DOSPI $USEGPIO -DSMTP_OPENSSL -std=c++14 -include string.h main.cpp OpenSprinkler.cpp program.cpp opensprinkler_server.cpp utils.cpp weather.cpp gpio.cpp mqtt.cpp smtp.c -Iexternal/TinyWebsockets/tiny_websockets_lib/include $ws -Iexternal/OpenThings-Framework-Firmware-Library/ $otf -lpthread -lmosquitto -lssl -lcrypto $GPIOLIB
 fi
 
-if [ ! "$SILENT" = true ] && [ -f OpenSprinkler.launch ] && [ ! -f /etc/init.d/OpenSprinkler.sh ]; then
+if [ -f /etc/init.d/OpenSprinkler.sh ]; then
+    echo "Detected the only init.d start up script, removing."
+    echo "If you still want OpenSprinkler to launch on startup make sure when you run the build script to answer \"Y\" to the following question."
+    /etc/init.d/OpenSprinkler.sh stop
+    rm /etc/init.d/OpenSprinkler.sh
+fi
+
+if [ ! "$SILENT" = true ] && [ -f OpenSprinkler.service ] && [ -f startOpenSprinkler.sh ] && [ ! -f /etc/systemd/system/OpenSprinkler.service ]; then
 
 	read -p "Do you want to start OpenSprinkler on startup? " -n 1 -r
 	echo
@@ -72,28 +79,25 @@ if [ ! "$SILENT" = true ] && [ -f OpenSprinkler.launch ] && [ ! -f /etc/init.d/O
 		exit 0
 	fi
 
-	echo "Adding OpenSprinkler launch script..."
+	echo "Adding OpenSprinkler launch service..."
 
 	# Get current directory (binary location)
-	pushd `dirname $0` > /dev/null
-	DIR=`pwd`
+	pushd "$(dirname $0)" > /dev/null
+	DIR="$(pwd)"
 	popd > /dev/null
 
 	# Update binary location in start up script
-	sed -e 's,\_\_OpenSprinkler\_Path\_\_,'"$DIR"',g' OpenSprinkler.launch > OpenSprinkler.sh
+	sed -e 's,\_\_OpenSprinkler\_Path\_\_,'"$DIR"',g' OpenSprinkler.service > /etc/systemd/system/OpenSprinkler.service
 
 	# Make file executable
-	chmod +x OpenSprinkler.sh
-
-	# Move start up script to init.d directory
-	sudo mv OpenSprinkler.sh /etc/init.d/
-
-	# Add to auto-launch on system startup
-	sudo update-rc.d OpenSprinkler.sh defaults
+	chmod +x startOpenSprinkler.sh
 
-	# Start the deamon now
-	sudo /etc/init.d/OpenSprinkler.sh start
+    # Reload systemd
+    systemctl daemon-reload
 
+    # Enable and start the service
+    systemctl enable OpenSprinkler
+    systemctl start OpenSprinkler
 fi
 
 echo "Done!"

startOpenSprinkler.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+cd "$(dirname "$0")"
+./OpenSprinkler

updater.sh

@@ -2,4 +2,4 @@
 
 git pull
 ./build.sh -s ospi
-/etc/init.d/OpenSprinkler.sh restart
+systemctl restart OpenSprinkler.service