From e36cac1188b42041c454ba2f4aeb09a053cf3f5f Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Tue, 23 Feb 2021 17:19:48 +0100
Subject: [PATCH] find config files in ERESSEA_DIR if config.install is not set

---
 scripts/eressea/path.lua | 11 ++++-------
 tests/eressea.ini        |  1 -
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/scripts/eressea/path.lua b/scripts/eressea/path.lua
index a0659ec58..2c352fe08 100644
--- a/scripts/eressea/path.lua
+++ b/scripts/eressea/path.lua
@@ -1,11 +1,8 @@
-local path = os.getenv("ERESSEA_DIR")
-if not path then
-    if config.install then
-	    path = config.install
-    else
-        path = '.'
-    end
+local path = '.'
+if config.install then
+	path = config.install
 else
+    path = os.getenv("ERESSEA_DIR") or path
     config.install = path
 end
 path = path .. "/scripts"
diff --git a/tests/eressea.ini b/tests/eressea.ini
index faf4b1b9e..3eb8e6189 100644
--- a/tests/eressea.ini
+++ b/tests/eressea.ini
@@ -7,6 +7,5 @@ locales                        = de,en
 
 [lua]
 install                        = ..
-paths                          = lunit:scripts
 maxnmrs                        = 20
 rules                          = e2