Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX

.gitignore

@@ -35,3 +35,4 @@ src/Handler/Course.SnapCustom.hs
 tags
 test.log
 *.dump-splices
+/.stack-work.lock

build.sh

@@ -2,6 +2,8 @@
 
 set -e
 
+[ "${FLOCKER}" != "$0" ] && exec env FLOCKER="$0" flock -en .stack-work.lock "$0" "$@" || :
+
 echo "Building..."
 stack build --fast --flag uniworx:-library-only --flag uniworx:dev $@
 echo "Done."

clean.sh

@@ -1,5 +1,9 @@
 #!/usr/bin/env bash
 
+set -e
+
+[ "${FLOCKER}" != "$0" ] && exec env FLOCKER="$0" flock -en .stack-work.lock "$0" "$@" || :
+
 case $1 in
     "")
         exec -- stack clean

db.sh

@@ -1,6 +1,9 @@
 #!/usr/bin/env bash
 # Options: see /test/Database.hs (Main)
+
 set -e
 
+[ "${FLOCKER}" != "$0" ] && exec env FLOCKER="$0" flock -en .stack-work.lock "$0" "$@" || :
+
 stack build --fast --flag uniworx:-library-only --flag uniworx:dev
 stack exec uniworxdb -- $@

deploy.sh

@@ -1,21 +0,0 @@
-#!/usr/bin/env sh
-
-configFile=""
-
-case "$1" in
-    test)
-        ln -svf "keter_testworx.yml" config/keter.yml
-
-        yesod keter
-        ;;
-    production)
-        ln -svf "keter_uni2work.yml" config/keter.yml
-
-        yesod keter && git tag -f live && git push origin live
-        ;;
-    *)
-        echo "Usage: $0 (test|production)" >&2
-        exit 2
-        ;;
-esac
-

ghci.sh

@@ -1,5 +1,9 @@
 #!/usr/bin/env bash
 
+set -e
+
+[ "${FLOCKER}" != "$0" ] && exec env FLOCKER="$0" flock -en .stack-work.lock "$0" "$@" || :
+
 unset HOST
 export DETAILED_LOGGING=true
 export LOG_ALL=true

haddock.sh

@@ -1,5 +1,9 @@
 #!/usr/bin/env bash
 
+set -e
+
+[ "${FLOCKER}" != "$0" ] && exec env FLOCKER="$0" flock -en .stack-work.lock "$0" "$@" || :
+
 move-back() {
     mv -v .stack-work .stack-work-doc
     [[ -d .stack-work-build ]] && mv -v .stack-work-build .stack-work

hlint.sh

@@ -1,3 +1,7 @@
 #!/usr/bin/env bash
 
+set -e
+
+[ "${FLOCKER}" != "$0" ] && exec env FLOCKER="$0" flock -en .stack-work.lock "$0" "$@" || :
+
 exec -- stack build --test --fast --flag uniworx:dev --flag uniworx:library-only uniworx:test:hlint

start.sh

@@ -1,5 +1,9 @@
 #!/usr/bin/env bash
 
+set -e
+
+[ "${FLOCKER}" != "$0" ] && exec env FLOCKER="$0" flock -en .stack-work.lock "$0" "$@" || :
+
 unset HOST
 export DETAILED_LOGGING=${DETAILED_LOGGIN:-true}
 export LOG_ALL=${LOG_ALL:-false}

test.sh

@@ -1,5 +1,9 @@
 #!/usr/bin/env bash
 
+set -e
+
+[ "${FLOCKER}" != "$0" ] && exec env FLOCKER="$0" flock -en .stack-work.lock "$0" "$@" || :
+
 move-back() {
     mv -v .stack-work .stack-work-test
     [[ -d .stack-work-build ]] && mv -v .stack-work-build .stack-work