Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-01-11 15:29:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1336 from mig5/1293_support_xdg_config_home_env_var

Browse Source 
Use XDG_CONFIG_HOME environment variable if it is present, otherwise fall back to ~/.config
This commit is contained in:
Micah Lee 2021-04-29 01:25:03 +00:00 committed by GitHub
commit 66918946ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cli/onionshare_cli/common.py
View File

@ -133,13 +133,21 @@ class Common:
except: except:
# If for some reason we don't have the 'APPDATA' environment variable # If for some reason we don't have the 'APPDATA' environment variable
# (like running tests in Linux while pretending to be in Windows) # (like running tests in Linux while pretending to be in Windows)
onionshare_data_dir = os.path.expanduser("~/.config/onionshare") try:
xdg_config_home = os.environ["XDG_CONFIG_HOME"]
onionshare_data_dir = f"{xdg_config_home}/onionshare"
except:
onionshare_data_dir = os.path.expanduser("~/.config/onionshare")
elif self.platform == "Darwin": elif self.platform == "Darwin":
onionshare_data_dir = os.path.expanduser( onionshare_data_dir = os.path.expanduser(
"~/Library/Application Support/OnionShare" "~/Library/Application Support/OnionShare"
) )
else: else:
onionshare_data_dir = os.path.expanduser("~/.config/onionshare") try:
xdg_config_home = os.environ["XDG_CONFIG_HOME"]
onionshare_data_dir = f"{xdg_config_home}/onionshare"
except:
onionshare_data_dir = os.path.expanduser("~/.config/onionshare")
# Modify the data dir if running tests # Modify the data dir if running tests
if getattr(sys, "onionshare_test_mode", False): if getattr(sys, "onionshare_test_mode", False):