From 95d570ee6859e39a9e871d57c98a1195e7eb7fc6 Mon Sep 17 00:00:00 2001 From: portnov Date: Fri, 27 Feb 2009 13:57:57 +0500 Subject: [PATCH] Try to find centrixd.ini in other places --- centrixd/cxconfig.py | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/centrixd/cxconfig.py b/centrixd/cxconfig.py index 883771f..4c66063 100644 --- a/centrixd/cxconfig.py +++ b/centrixd/cxconfig.py @@ -1,3 +1,5 @@ +from os.path import exists, expanduser + from configobj import ConfigObj from louie import dispatcher from cxutils import log @@ -15,5 +17,15 @@ class CXConfig(ConfigObj): ConfigObj.reload(self) dispatcher.send("reconfig") -config = CXConfig("./centrixd.ini") +def detect_config_name(): + paths = [expanduser('~/.config/centrixd.ini'), + '/etc/centrixd.ini', + '/etc/centrix/centrixd.ini', + './centrixd.ini', + 'centrixd/centrixd.ini'] + for path in paths: + if exists(path): + return path + +config = CXConfig(detect_config_name()) -- 1.7.2.3