Bitmessage/PyBitmessage-2024-12-19
Archived
2
0
Fork 0
Code Issues 168 Pull Requests 52 Actions Packages Projects Releases 5 Wiki Activity

Try using ANDROID_PRIVATE instead of HOME if not found

Browse Source
This commit is contained in:
Dmitri Bogomolov 2019-09-25 18:20:51 +03:00
parent 84482f2627
commit beb15d9b77
Signed by untrusted user: g1itch
GPG Key ID: 720A756F18DEED13
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/paths.py
View File

@ -52,20 +52,27 @@ def lookupAppdataFolder():
sys.getfilesystemencoding(), 'ignore'), APPNAME sys.getfilesystemencoding(), 'ignore'), APPNAME
) + os.path.sep ) + os.path.sep
else: else:
homedir = os.environ.get('XDG_CONFIG_HOME')
if not homedir:
try: try:
dataFolder = os.path.join(os.environ['XDG_CONFIG_HOME'], APPNAME) homedir = os.path.join(os.environ['HOME'], '.config')
except KeyError: except KeyError:
dataFolder = os.path.join(os.environ['HOME'], '.config', APPNAME) # Nonstandard environment, try android vars
homedir = os.environ.get('ANDROID_PRIVATE')
dataFolder = os.path.join(homedir, APPNAME)
# Migrate existing data to the proper location # Migrate existing data to the proper location
# if this is an existing install # if this is an existing install
try: try:
move(os.path.join(os.environ['HOME'], '.%s' % APPNAME), dataFolder) move(
os.path.join(os.environ.get('HOME', ''), '.%s' % APPNAME),
dataFolder)
logger.info('Moving data folder to %s', dataFolder) logger.info('Moving data folder to %s', dataFolder)
except IOError: except IOError:
# Old directory may not exist. # Old directory may not exist.
pass pass
dataFolder = dataFolder + os.path.sep dataFolder += os.path.sep
return dataFolder return dataFolder