diff --git a/start.sh b/start.sh index fb7492ae7..07dbe3b90 100755 --- a/start.sh +++ b/start.sh @@ -2,18 +2,11 @@ set -e -# SPDX-FileCopyrightText: 2022 Gregor Kleen ,Sarah Vaupel ,Steffen Jost +# SPDX-FileCopyrightText: 2022-2024 Sarah Vaupel , Gregor Kleen , Sarah Vaupel , Steffen Jost # # SPDX-License-Identifier: AGPL-3.0-or-later -[ "${FLOCKER}" != "$0" ] && exec env FLOCKER="$0" flock -en .stack-work.lock "$0" "$@" || : - -if ! in-develop | grep -q 'In develop'; then - printf "Not in develop" - exit 1 -fi - __HOST=${HOST:-$(hostname -s | awk '{ print $0; }')} export DETAILED_LOGGING=${DETAILED_LOGGING:-true} @@ -33,23 +26,12 @@ export MAIL_REROUTE_TO_NAME='Steffen Jost' export MAIL_REROUTE_TO_EMAIL=jost@tcs.ifi.lmu.de unset HOST -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 yesod)" ] then yesod devel -p $((${PORT_OFFSET:-0} + 3000)) -q $((${PORT_OFFSET:-0} + 3443)) $@ elif ! [ -z "$(which stack)" ] then - stack exec -- yesod devel -p $((${PORT_OFFSET:-0} + 3000)) -q $((${PORT_OFFSET:-0} + 3443)) $@ + stack exec -- yesod devel -p $((${PORT_OFFSET:-0} + 3000)) -q $((${PORT_OFFSET:-0} + 3443)) else exit 1 fi