Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into develop

This commit is contained in:
Enno Rehling 2020-05-02 11:02:49 +02:00
parent c17a2ffe02 d4c299eaf4
commit 346d62e1aa
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
process/cron/preview.cron
View File

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

2
process/cron/run-eressea.cron
View File

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