From 2dbcd18c06dd78491026bcb6fbd770175de4948f Mon Sep 17 00:00:00 2001 From: "Jose M. Guisado" Date: Thu, 18 Nov 2021 16:31:36 +0100 Subject: #1065 revisit config_path initialization If current platform is Linux (either live, virtual or linux) expect /opt/opengnsys/ogclient/cfg/ to contain ogclient.json. If current platform is not Linux then we fallback to current directory. --- ogclient | 2 +- src/ogClient.py | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ogclient b/ogclient index 4f8ca56..41e7d41 100755 --- a/ogclient +++ b/ogclient @@ -22,7 +22,7 @@ from src.log import configure_logging def main(): - config_path = f'{ogClient.OG_PATH}ogclient/cfg/ogclient.json' + config_path = f'{ogClient.OG_PATH}cfg/ogclient.json' try: with open(config_path, 'r') as f: CONFIG = json.load(f) diff --git a/src/ogClient.py b/src/ogClient.py index 13a55f4..5fcb1c8 100644 --- a/src/ogClient.py +++ b/src/ogClient.py @@ -24,7 +24,10 @@ class State(Enum): FORCE_DISCONNECTED = 2 class ogClient: - OG_PATH = '/opt/opengnsys/' + if platform.system().lower() == 'linux': + OG_PATH = '/opt/opengnsys/ogclient/' + else: + OG_PATH = './' def __init__(self, config): self.CONFIG = config -- cgit v1.2.3-18-g5258