From dd0cffb4b5b60a9b3790e352d699b02da089956b Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Mon, 17 Apr 2023 21:09:57 +0200
Subject: [PATCH 1/6] Version

---
 agent/agent.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/agent/agent.sh b/agent/agent.sh
index 11f29fa..a4c872e 100644
--- a/agent/agent.sh
+++ b/agent/agent.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -u
 
-VERSION="4"
+VERSION="5"
 HEADER="VirtualDSM Agent"
 
 # Functions

From be22f2cd1c7bec44ed367b4e209b42d0465295e7 Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Mon, 17 Apr 2023 21:10:38 +0200
Subject: [PATCH 2/6] Version

---
 run/disk.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/run/disk.sh b/run/disk.sh
index b4585ec..1ee70af 100644
--- a/run/disk.sh
+++ b/run/disk.sh
@@ -84,7 +84,7 @@ AGENT_VERSION=1
 AGENT="${STORAGE}/${BASE}.agent"
 [ -f "$AGENT" ] && AGENT_VERSION=$(cat "${AGENT}")
 
-if ((AGENT_VERSION < 4)); then
+if ((AGENT_VERSION < 5)); then
   echo "INFO: The installed VirtualDSM Agent is an outdated version, please upgrade it."
 fi
 

From b58e876c8e3379b04649c9952a21a8e16de9ee51 Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Mon, 17 Apr 2023 21:11:01 +0200
Subject: [PATCH 3/6] Version

---
 run/install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/run/install.sh b/run/install.sh
index fb69e3b..ad8f6d5 100644
--- a/run/install.sh
+++ b/run/install.sh
@@ -163,7 +163,7 @@ cp /agent/service.sh $LOC/agent.sh
 chmod +x $LOC/agent.sh
 
 # Store agent version
-echo "4" > "$STORAGE"/"$BASE".agent
+echo "5" > "$STORAGE"/"$BASE".agent
 
 echo "Install: Installing system partition..."
 

From a2eafc93e65d34878e17c3565d3d4caa95563d17 Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Mon, 17 Apr 2023 22:41:53 +0200
Subject: [PATCH 4/6] Service

---
 agent/service.sh | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/agent/service.sh b/agent/service.sh
index e19356c..1998427 100644
--- a/agent/service.sh
+++ b/agent/service.sh
@@ -5,29 +5,33 @@ SCRIPT="/usr/local/bin/agent.sh"
 
 status() {
   if [ -f "$PIDFILE" ]; then
-    echo 'Service running' >&2
-    return 1
+    echo 'Service running'
+    exit 1
   fi
 }
 
 start() {
   if [ -f "$PIDFILE" ] && kill -0 "$(cat "$PIDFILE")"; then
-    echo 'Service already running' >&2
-    return 1
+    echo 'Service already running'
+    exit 1
   fi
-  printf 'Starting agent service...' >&2
+  echo 'Starting agent service...'
   chmod 666 /dev/ttyS0
   "$SCRIPT" &> /dev/ttyS0 & echo $! > "$PIDFILE"
+  exit 0
 }
 
 stop() {
   if [ ! -f "$PIDFILE" ] || ! kill -0 "$(cat "$PIDFILE")"; then
-    echo 'Service not running' >&2
-    return 1
+    echo 'Service not running'
+    exit 1
   fi
-  echo 'Stopping agent service' >&2
+  echo 'Stopping agent service...'
+  chmod 666 /dev/ttyS0
+  echo 'Stopping agent service...' > /dev/ttyS0
   kill -15 "$(cat "$PIDFILE")" && rm -f "$PIDFILE"
-  echo 'Service stopped' >&2
+  echo 'Service stopped'
+  exit 0
 }
 
 case "$1" in

From 868d5493a4cea41ae6baaab1c5c70d6ebdd8bcc5 Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Mon, 17 Apr 2023 22:57:33 +0200
Subject: [PATCH 5/6] Ready

---
 agent/agent.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/agent/agent.sh b/agent/agent.sh
index a4c872e..7277547 100644
--- a/agent/agent.sh
+++ b/agent/agent.sh
@@ -123,6 +123,7 @@ delay=5000
 elapsed=$((($(date +%s%N) - ts)/1000000))
 
 if (( delay > elapsed )); then
+  echo "$HEADER: Ready..."
   difference=$((delay-elapsed))
   float=$(echo | awk -v diff="${difference}" '{print diff * 0.001}')
   sleep "$float"

From 35588efcf0dcff44ae338d0f969d6d7ba04d738e Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Mon, 17 Apr 2023 23:01:32 +0200
Subject: [PATCH 6/6] Returncodes

---
 agent/service.sh | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/agent/service.sh b/agent/service.sh
index 1998427..4527352 100644
--- a/agent/service.sh
+++ b/agent/service.sh
@@ -6,32 +6,30 @@ SCRIPT="/usr/local/bin/agent.sh"
 status() {
   if [ -f "$PIDFILE" ]; then
     echo 'Service running'
-    exit 1
+    return 1
   fi
 }
 
 start() {
   if [ -f "$PIDFILE" ] && kill -0 "$(cat "$PIDFILE")"; then
     echo 'Service already running'
-    exit 1
+    return 1
   fi
   echo 'Starting agent service...'
   chmod 666 /dev/ttyS0
   "$SCRIPT" &> /dev/ttyS0 & echo $! > "$PIDFILE"
-  exit 0
 }
 
 stop() {
   if [ ! -f "$PIDFILE" ] || ! kill -0 "$(cat "$PIDFILE")"; then
     echo 'Service not running'
-    exit 1
+    return 1
   fi
   echo 'Stopping agent service...'
   chmod 666 /dev/ttyS0
   echo 'Stopping agent service...' > /dev/ttyS0
   kill -15 "$(cat "$PIDFILE")" && rm -f "$PIDFILE"
   echo 'Service stopped'
-  exit 0
 }
 
 case "$1" in