From 3b9b9c244e450f7ad12fb73f6d2f0020cf212698 Mon Sep 17 00:00:00 2001 From: Urban Wallasch Date: Thu, 20 May 2021 16:57:53 +0200 Subject: [PATCH] * Tweaked config file search method, again. --- ffpreview.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ffpreview.py b/ffpreview.py index 514d981..1b51cb0 100755 --- a/ffpreview.py +++ b/ffpreview.py @@ -227,9 +227,11 @@ class ffConfig: cfg['conffile'] = args.config else: # try to locate a user config file + home = os.environ.get('HOME') cfg['conffile'] = os.path.join( - os.path.join(os.environ['HOME'], '.config') or + os.path.dirname(os.path.realpath(__file__)) or os.environ.get('XDG_CONFIG_HOME') or + (os.path.join(home, '.config') if home else None) or os.environ.get('APPDATA') or sys.path[0], cfg['conffile'] @@ -241,7 +243,7 @@ class ffConfig: for option in fconf.options('Default'): cfg[option] = fconf.get('Default', option) except Exception as e: - eprint(1, str(e), '(config file missing or corrupt)', vo=vo) + eprint(1, str(e), '(config file', cfg['conffile'], 'missing or corrupt)', vo=vo) else: eprint(1, 'read config from', cfg['conffile'], vo=vo) # fix up types of non-string options -- 2.30.2