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

find config files in ERESSEA_DIR if config.install is not set

This commit is contained in:
Enno Rehling 2021-02-23 17:19:48 +01:00
parent 8421e64c6e
commit e36cac1188
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/eressea/path.lua
View File

@ -1,11 +1,8 @@
local path = os.getenv("ERESSEA_DIR") local path = '.'
if not path then
if config.install then if config.install then
path = config.install path = config.install
else else
path = '.' path = os.getenv("ERESSEA_DIR") or path
end
else
config.install = path config.install = path
end end
path = path .. "/scripts" path = path .. "/scripts"

1
tests/eressea.ini
View File

@ -7,6 +7,5 @@ locales = de,en
[lua] [lua]
install = .. install = ..
paths = lunit:scripts
maxnmrs = 20 maxnmrs = 20
rules = e2 rules = e2