Merge branch 'develop' of github.com:ennorehling/eressea into develop

This commit is contained in:
Enno Rehling 2020-05-02 11:14:17 +02:00
commit 78ca97be4b
2 changed files with 3 additions and 0 deletions

View File

@ -3,6 +3,7 @@
[ "$PREVIEW" != "yes" ] && exit
[ -z "${ERESSEA}" ] && ERESSEA="$HOME/eressea"
eval $(luarocks path)
branch="develop"
if [ -e "${ERESSEA}/build/.preview" ]; then
branch=$(cat "${ERESSEA}/build/.preview")

View File

@ -1,4 +1,6 @@
#!/bin/bash
eval $(luarocks path)
GAME=$1
(
[ "$ENABLED" != "yes" ] && exit