Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions juju/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,11 @@ def juju_config_dir():
config_dir = Path('~/.local/share/juju')

# Check $JUJU_DATA
if juju_data := os.environ.get('JUJU_DATA'):
config_dir = Path(juju_data)
if os.environ.get('JUJU_DATA'):
config_dir = Path(os.environ.get('JUJU_DATA'))
# Secondly check: $XDG_DATA_HOME for ~/.local/share
elif xdg_data_home := os.environ.get('XDG_DATA_HOME'):
config_dir = Path(xdg_data_home) / 'juju'
elif os.environ.get('XDG_DATA_HOME'):
config_dir = Path(os.environ.get('XDG_DATA_HOME')) / 'juju'

return str(config_dir.expanduser().resolve())

Expand Down