From 247e660717d3d0dd38dc5cbcfc3e98cd15d0cece Mon Sep 17 00:00:00 2001
From: Markus Zolliker <markus.zolliker@psi.ch>
Date: Wed, 20 Apr 2022 16:08:05 +0200
Subject: [PATCH] fix issues with config dirs

---
 frappyman.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/frappyman.py b/frappyman.py
index 9767f53..685b0ed 100644
--- a/frappyman.py
+++ b/frappyman.py
@@ -51,7 +51,7 @@ class FrappyManager(ServiceManager):
         cfgparser.optionxform = str
         cfgparser.read(self.env[ins]['FRAPPY_CONFIG_FILE'])
         for cfgpath in cfgparser['confdir'].split(os.pathsep):
-            if cfgpath.endswith('SERV'):
+            if cfgpath.endswith('<SERV>'):
                 cfgpaths.append(cfgpath[:-4] + service)
             else:
                 scfg = join(cfgpath, service)
@@ -62,9 +62,10 @@ class FrappyManager(ServiceManager):
 
     def prepare_start(self, ins, service, cfg=''):
         start_dir, env = super().prepare_start(ins, service)
-        his = env.get('FRAPPY_HISTORY')
-        if his:
-            env['FRAPPY_HISTORY'] = his.replace('_SERVICE', '_' + service)
+        for key, value in env.items():
+            if key.startswith('FRAPPY_') and '<SERV>' in value:
+                env[key] = value.replace('<SERV>', service)
+                os.environ[key] = env[key]
         cfgpaths = self.config_dirs(ins, service)
         if cfgpaths:
             env['FRAPPY_CONFDIR'] = os.pathsep.join(cfgpaths)