Merge branch 'master' of github.com:Bitmessage/PyBitmessage

2013-06-26 14:01:17 -04:00 · 2013-06-26 14:01:17 -04:00 · 20994adf78
commit 20994adf78
parent 9230e40e29 e9fbbe3dcc
3 changed files with 12 additions and 1 deletions
--- a/src/api_client.py
+++ b/src/api_client.py
--- a/src/message_data_reader.py
+++ b/src/message_data_reader.py
--- 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):