From: Benjamin Cremer Date: Fri, 6 Feb 2015 19:47:44 +0000 (+0100) Subject: Use XDG Base Directory Specification for config files X-Git-Tag: 1.0~85 X-Git-Url: https://git.donarmstrong.com/?p=deb_pkgs%2Fautorandr.git;a=commitdiff_plain;h=0c01c37e5db07e2a81ff248b23f473eb84119d87 Use XDG Base Directory Specification for config files --- diff --git a/autorandr.py b/autorandr.py index 72f48b8..e79aefb 100755 --- a/autorandr.py +++ b/autorandr.py @@ -67,7 +67,7 @@ Usage: autorandr [options] --default . Another script called "postswitch "can be placed in the directory - ~/.autorandr as well as in any profile directories: The scripts are executed + ~/.config/autorandr as well as in any profile directories: The scripts are executed after a mode switch has taken place and can notify window managers. The following virtual configurations are available: @@ -496,7 +496,11 @@ def main(argv): print(str(e)) options = { "--help": True } - profile_path = os.path.expanduser("~/.autorandr") + profile_dir = os.path.expanduser("~/.autorandr") + if not os.path.isdir(profile_dir): + profile_dir = os.path.join(os.environ.get("XDG_CONFIG_HOME", os.path.expanduser("~/.config")), "autorandr") + + profile_path = os.path.join(profile_dir, "profiles") try: profiles = load_profiles(profile_path) diff --git a/bash_completion/autorandr b/bash_completion/autorandr index 61de0bb..caa6b90 100644 --- a/bash_completion/autorandr +++ b/bash_completion/autorandr @@ -12,6 +12,8 @@ _autorandr () lopts="--help --change --save --load --default --force --fingerprint --config --dry-run" if [ -d ~/.autorandr ]; then prfls="`find ~/.autorandr/* -maxdepth 1 -type d -printf '%f\n'`" + if [ -d ~/.config/autorandr ]; then + prfls="`find ~/.config/autorandr/* -maxdepth 1 -type d -printf '%f\n'`" else prfls="" fi