From ad5517b41b4b21b7127e8a41e94efa587c7c50e6 Mon Sep 17 00:00:00 2001 From: Carlos Killpack Date: Wed, 26 Jun 2013 03:11:32 -0600 Subject: [PATCH] Fixed issue #157: Use $XDG_CONFIG_HOME --- src/shared.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/shared.py b/src/shared.py index 5dc6964b..22c3b9f6 100644 --- a/src/shared.py +++ b/src/shared.py @@ -124,7 +124,18 @@ def lookupAppdataFolder(): elif 'win32' in sys.platform or 'win64' in sys.platform: dataFolder = path.join(environ['APPDATA'], APPNAME) + '\\' else: - dataFolder = path.expanduser(path.join("~", "." + APPNAME + "/")) + from shutil import move + try: + dataFolder = path.join(environ["XDG_CONFIG_HOME"], APPNAME) + except KeyError: + dataFolder = path.join(environ["HOME"], ".config", APPNAME) + # Migrate existing data to the proper location if this is an existing install + try: + print "Moving data folder to ~/.config/%s" % APPNAME + move(path.join(environ["HOME"], ".%s" % APPNAME), dataFolder) + dataFolder = dataFolder + '/' + except IOError: + dataFolder = dataFolder + '/' return dataFolder def isAddressInMyAddressBook(address): -- 2.45.1