From b7566ef3b3f6dc88c6e5c0cca7c3aa67ee2fc595 Mon Sep 17 00:00:00 2001
From: Takiguchi <florian.thierry72@gmail.com>
Date: Mon, 28 May 2018 21:38:32 +0200
Subject: [PATCH] Clean bash script.

---
 src/main/bash/codiki.bash | 39 +++++++++++++++++----------------------
 1 file changed, 17 insertions(+), 22 deletions(-)

diff --git a/src/main/bash/codiki.bash b/src/main/bash/codiki.bash
index eb39a25..1d84e47 100755
--- a/src/main/bash/codiki.bash
+++ b/src/main/bash/codiki.bash
@@ -2,31 +2,29 @@
 
 workspace='/opt/codiki'
 codikiScreenName='codiki'
-lockFile='/bin/lock'
-deadFile='/bin/dead'
+logFile='codiki-'`date '+%Y-%m-%d_%H-%M-%S'`'.log'
 screenRegex='codiki.\(([0-9]{2}/){2}[0-9]{4} [0-9]{2}(:[0-9]{2}){2}\)'
 
+# Colors
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+NC='\033[0m'
+
 start() {
-    screen -dmS $codikiScreenName java -jar $workspace/bin/codiki.jar
-    if [ $? -eq 0 ]
+    screen -dmS "$codikiScreenName" java -jar $workspace/bin/codiki.jar &>> "$workspace/log/$logFile"
+    if [ $? -ne 0 ]
     then
-        date > $workspace$lockFile
-        rm -f $workspace$deadFile
-    else
         echo "Service failed to start..."
         exit 1
     fi
 }
 
 stop() {
-    if [ $(status_by_screen) -eq 1 ] && [ -f $workspace$lockFile ]
+    if [ $(status_by_screen) -eq 1 ]
     then
         screen -dr $codikiScreenName -X -S quit
-        if [ $? -eq 0 ]
+        if [ $? -ne 0 ]
         then
-            rm -f $workspace$lockFile
-            date > $workspace$deadFile
-        else
             echo "Service failed to stop..."
             exit 1
         fi
@@ -36,24 +34,20 @@ stop() {
 }
 
 status() {
-    if [ -f $workspace$lockFile ] && [ $(status_by_screen) -eq 1 ]
+    if [ $(status_by_screen) -eq 1 ]
     then
-        tput setaf 2; cat << EOF
- codiki.service - The Codiki web app server
-    Active: active (running) since $(cat $lockFile)
-EOF
+        echo -e " codiki.service - The Codiki web app server"
+        echo -e "    Active: ${GREEN}active${NC} (running)"
         echo ''
     else
-        tput setaf 1; cat << EOF
- codiki.service - The Codiki web app server
-    Active: inactive (dead) since $(cat $deadFile)
-EOF
+        echo -e " codiki.service - The Codiki web app server"
+        echo -e "    Active: ${RED}inactive${NC} (dead)"
         echo ''
     fi
 }
 
 restart() {
-    if [ -f $workspace$lockFile ]
+    if [ $(status_by_screen) -eq 1 ]
     then
         stop
     fi
@@ -79,6 +73,7 @@ case "$1" in
         ;;
     *)
         echo "Usage: $0 {start|stop|status}"
+        echo ''
         exit 1
 esac
 exit 0