Fixed bash-completion (Lacked an `else')

[deb_pkgs/autorandr.git] / autorandr.py

diff --git a/autorandr.py b/autorandr.py
index 1339014c01cbfb2879fd654325bf0faec899a1c6..e79aefbc72470cf130f8aa74ce9f7e7883162574 100755 (executable)
--- a/autorandr.py
+++ b/autorandr.py
@@ -4,7 +4,7 @@
 # autorandr.py
 # Copyright (c) 2015, Phillip Berndt
 #
-# Experimental autorandr rewrite in Python
+# Autorandr rewrite in Python
 #
 # This script aims to be fully compatible with the original autorandr.
 #
@@ -67,7 +67,7 @@ Usage: autorandr [options]
  --default <profile>.
 
  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:
@@ -123,7 +123,7 @@ class XrandrOutput(object):
         "gamma": "1.0:1.0:1.0",
     }
 
-    XRANDR_DEFAULTS = dict(XRANDR_13_DEFAULTS.items() + XRANDR_12_DEFAULTS.items())
+    XRANDR_DEFAULTS = dict(list(XRANDR_13_DEFAULTS.items()) + list(XRANDR_12_DEFAULTS.items()))
 
     def __repr__(self):
         return "<%s%s %s>" % (self.output, (" %s..%s" % (self.edid[:5], self.edid[-5:])) if self.edid else "", " ".join(self.option_vector))
@@ -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)