contrib/run-from-source.sh: Fix up for the paths now used

This commit is contained in:
Athanasius 2021-07-05 14:31:57 +00:00
parent 50d7af3149
commit 8f36f8dcfe

20
contrib/run-from-source.sh Normal file → Executable file
View File

@ -1,28 +1,29 @@
#!/bin/bash #!/bin/bash -x
# vim: textwidth=0 wrapmargin=0 tabstop=2 shiftwidth=2 softtabstop=2 smartindent smarttab
BASEPATH="TOP LEVEL OF GIT CLONE" BASEPATH="${HOME}/dev"
LOGPATH="${BASEPATH}/logs" LOGPATH="${BASEPATH}/logs"
PYTHON="python2.7" PYTHON="python2.7"
cd "${BASEPATH}" || exit 1 cd "${BASEPATH}" || exit 1
mkdir -p ${LOGPATH} || exit 2 mkdir -p ${LOGPATH} || exit 2
cd eddn/src/eddn || exit 4 cd EDDN.git/src/eddn || exit 4
for d in Relay Monitor Gateway ; for d in Relay Monitor Gateway ;
do do
echo "$d" 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 then
echo "$d: Already running as $(cat ${LOGPATH}/${d}.pid)" echo "$d: Already running as $(cat ${PID_FILE})"
continue continue
fi fi
if [ -f "${BASEPATH}/etc/settings.json" ]; CONFIG_FILE="${HOME}/.local/share/eddn/dev/config.json"
if [ -f "${CONFIG_FILE}" ];
then then
CONFIG="--config ${BASEPATH}/etc/settings.json" CONFIG="--config ${CONFIG_FILE}"
else else
echo "WARNING: No override settings found, you'll be using defaults" 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..." echo " Continuing anyway..."
CONFIG="" CONFIG=""
fi fi
@ -34,3 +35,4 @@ do
#sleep 1 #sleep 1
done done
# vim: textwidth=0 wrapmargin=0 tabstop=2 shiftwidth=2 softtabstop=2 smartindent smarttab