From 8f36f8dcfebac72e6d46641a9cb62d316e7408e7 Mon Sep 17 00:00:00 2001
From: Athanasius <github@miggy.org>
Date: Mon, 5 Jul 2021 14:31:57 +0000
Subject: [PATCH] contrib/run-from-source.sh: Fix up for the paths now used

---
 contrib/run-from-source.sh | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)
 mode change 100644 => 100755 contrib/run-from-source.sh

diff --git a/contrib/run-from-source.sh b/contrib/run-from-source.sh
old mode 100644
new mode 100755
index 85e587e..7ba0414
--- a/contrib/run-from-source.sh
+++ b/contrib/run-from-source.sh
@@ -1,28 +1,29 @@
-#!/bin/bash
-# vim: textwidth=0 wrapmargin=0 tabstop=2 shiftwidth=2 softtabstop=2 smartindent smarttab
+#!/bin/bash -x
 
-BASEPATH="TOP LEVEL OF GIT CLONE"
+BASEPATH="${HOME}/dev"
 LOGPATH="${BASEPATH}/logs"
 PYTHON="python2.7"
 
 cd "${BASEPATH}" || exit 1
 mkdir -p ${LOGPATH} || exit 2
-cd eddn/src/eddn || exit 4
+cd EDDN.git/src/eddn || exit 4
 
 for d in Relay Monitor Gateway ;
 do
 	echo "$d"
-	if ps "$(cat ${LOGPATH}/${d}.pid)" >/dev/null 2>&1;
+	PID_FILE="${LOGPATH}/${d}.pid"
+	if ps "$(cat ${PID_FILE})" >/dev/null 2>&1;
 	then
-		echo "$d: Already running as $(cat ${LOGPATH}/${d}.pid)"
+		echo "$d: Already running as $(cat ${PID_FILE})"
 		continue
 	fi
-	if [ -f "${BASEPATH}/etc/settings.json" ];
+	CONFIG_FILE="${HOME}/.local/share/eddn/dev/config.json"
+	if [ -f "${CONFIG_FILE}" ];
 	then
-		CONFIG="--config ${BASEPATH}/etc/settings.json"
+		CONFIG="--config ${CONFIG_FILE}"
 	else
 		echo "WARNING: No override settings found, you'll be using defaults"
-		echo "WARNING: Did you forget to make ${BASEPATH}/etc/settings.json ?"
+		echo "WARNING: Did you forget to make ${CONFIG_FILE} ?"
 		echo "         Continuing anyway..."
 		CONFIG=""
 	fi
@@ -34,3 +35,4 @@ do
 	#sleep 1
 done
 
+# vim: textwidth=0 wrapmargin=0 tabstop=2 shiftwidth=2 softtabstop=2 smartindent smarttab