From dba2c4cfeda80104e2570ed3303050fb2564a5ab Mon Sep 17 00:00:00 2001
From: Steve Clement <steve@localhost.lu>
Date: Mon, 2 Apr 2018 15:20:52 +0900
Subject: [PATCH] =?UTF-8?q?-=20Gave=20up=20on=20screen,=20it=20is=20just?=
 =?UTF-8?q?=20not=20doable=20with=20my=20current=20skill-set=E2=80=A6=20-?=
 =?UTF-8?q?=20removed=20obsolete=20redis-server=20from=20source=20detectio?=
 =?UTF-8?q?n=20(redis=20is=20at=20a=20usuable=20version=20in=20latest=20ub?=
 =?UTF-8?q?untu)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 start_all.sh | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/start_all.sh b/start_all.sh
index 3a60d57..c24cd8b 100755
--- a/start_all.sh
+++ b/start_all.sh
@@ -20,11 +20,7 @@ else
     exit 1
 fi
 
-redis_dir="${DASH_HOME}/../redis/src/"
-if [ ! -e "${redis_dir}" ]; then
-    [ ! -f "`which redis-server`" ] && echo "Either ${DASH_HOME}/../redis/src/ does not exist or 'redis-server' is not installed/not on PATH. Please fix and run again." && exit 1
-    redis_dir=""
-fi
+[ ! -f "`which redis-server`" ] && echo "'redis-server' is not installed/not on PATH. Please fix and run again." && exit 1
 
 netstat -an |grep LISTEN |grep 6250 |grep -v tcp6 ; check_redis_port=$?
 
@@ -36,22 +32,19 @@ export FLASK_HOST=127.0.0.1
 
 conf_dir="config/"
 
-screenName="Misp-Dashboard"
-
-screen -dmS "$screenName"
 sleep 0.1
 if [ "${check_redis_port}" == "1" ]; then
     echo -e $GREEN"\t* Launching Redis servers"$DEFAULT
-    screen -S "$screenName" -X screen -t "redis-server" bash -c '${0}redis-server ${1}6250.conf && echo "Started Redis" ; read x' ${redis_dir} ${conf_dir}
+    redis-server ${conf_dir}6250.conf &
 else
     echo -e $RED"\t* NOT starting Redis server, made a very unrealiable check on port 6250, and something seems to be there… please double check if this is good!"$DEFAULT
 fi
 
 echo -e $GREEN"\t* Launching zmq subscriber"$DEFAULT
-screen -S "$screenName" -X screen -t "zmq-subscriber" bash -c 'echo "Starting zmq-subscriber" ; ${0} ./zmq_subscriber.py; read x' ${ENV_PY}
+${ENV_PY} ./zmq_subscriber.py &
 
 echo -e $GREEN"\t* Launching zmq dispatcher"$DEFAULT
-screen -S "$screenName" -X screen -t "zmq-dispatcher" bash -c 'echo "Starting zmq-dispatcher"; ${0} ./zmq_dispatcher.py; read x' ${ENV_PY}
+${ENV_PY} ./zmq_dispatcher.py &
 
 echo -e $GREEN"\t* Launching flask server"$DEFAULT
-screen -S "$screenName" -X screen -t "flask" bash -c 'echo "Starting Flask Server"; ${0} ./server.py; read x' ${ENV_PY}
+${ENV_PY} ./server.py &