build(Makefile): inline start.sh

This commit is contained in:
Sarah Vaupel 2024-10-21 15:36:20 +02:00
parent ed88d9be05
commit ddc51e2d7a
2 changed files with 2 additions and 46 deletions

View File

@ -171,10 +171,10 @@ well-known: static;
%-backend: FRADRIVE_SERVICE=backend
%-backend: --image-build --containerized---%-backend;
--start-backend: start.sh
--start-backend:
DEV_PORT_HTTP=`cat $(CONTAINER_FILE) | grep 'DEV_PORT_HTTP=' | sed 's/DEV_PORT_HTTP=//'`; \
DEV_PORT_HTTPS=`cat $(CONTAINER_FILE) | grep 'DEV_PORT_HTTPS=' | sed 's/DEV_PORT_HTTPS=//'`; \
./start.sh
stack --work-dir .stack-work-run exec -- yesod devel -p "$${DEV_PORT_HTTP}" -q "$${DEV_PORT_HTTPS}"
--start-hoogle-backend:
HOOGLE_PORT=`cat $(CONTAINER_FILE) | grep 'HOOGLE_PORT=' | sed 's/HOOGLE_PORT=//'` ; \
echo "${HOOGLE_PORT}" ; \

View File

@ -1,44 +0,0 @@
#!/usr/bin/env bash
set -e
# SPDX-FileCopyrightText: 2022-2024 Sarah Vaupel <sarah.vaupel@uniworx.de>, Gregor Kleen <gregor.kleen@ifi.lmu.de>, Sarah Vaupel <vaupel.sarah@campus.lmu.de>, Steffen Jost <jost@tcs.ifi.lmu.de>
#
# SPDX-License-Identifier: AGPL-3.0-or-later
__HOST=${HOST:-$(hostname -s | awk '{ print $0; }')}
export DETAILED_LOGGING=${DETAILED_LOGGING:-true}
export LOG_ALL=${LOG_ALL:-false}
export LOGLEVEL=${LOGLEVEL:-info}
export DUMMY_LOGIN=${DUMMY_LOGIN:-true}
export SERVER_SESSION_ACID_FALLBACK=${SERVER_SESSION_ACID_FALLBACK:-true}
export SERVER_SESSION_COOKIES_SECURE=${SERVER_SESSION_COOKIES_SECURE:-false}
export COOKIES_SECURE=${COOKIES_SECURE:-false}
export ALLOW_DEPRECATED=${ALLOW_DEPRECATED:-true}
export ENCRYPT_ERRORS=${ENCRYPT_ERRORS:-false}
export RIBBON=${RIBBON:-${__HOST:-localhost}}
export APPROOT=${APPROOT:-http://localhost:$DEV_PORT_HTTP}
export AVSPASS=${AVSPASS:-nopasswordset}
unset HOST
# export PORT_OFFSET=$(((16#$(sha256sum <<<"$(hostname -f):''${basePath}" | head -c 16)) % 1000))
# move-back() {
# mv -vT .stack-work .stack-work-run
# [[ -d .stack-work-build ]] && mv -vT .stack-work-build .stack-work
# }
# if [[ -d .stack-work-run ]]; then
# [[ -d .stack-work ]] && mv -vT .stack-work .stack-work-build
# mv -vT .stack-work-run .stack-work
# trap move-back EXIT
# fi
if ! [ -z "$(which stack)" ]
then
stack --jobs 4 --work-dir .stack-work-run exec -- yesod devel -p "$DEV_PORT_HTTP" -q "$DEV_PORT_HTTPS" $@
else
exit 1
fi