From 89638e55d64388c61895521fd2b522bd893bcd4e Mon Sep 17 00:00:00 2001
From: Thomas Adamcik <thomas@adamcik.no>
Date: Sun, 15 Dec 2013 23:05:29 +0100
Subject: [PATCH] flags: use $XDG_CONFIG_DIRS and $XDG_CONFIG_HOME as defaults

This does not add support for '$XDG_CONFIG_DIRS' expansion, it just makes the
default include what it is set to.
---
 mopidy/commands.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/mopidy/commands.py b/mopidy/commands.py
index 36f5ae1a..cba247fc 100644
--- a/mopidy/commands.py
+++ b/mopidy/commands.py
@@ -6,6 +6,7 @@ import logging
 import os
 import sys
 
+import glib
 import gobject
 
 from mopidy import config as config_lib
@@ -15,6 +16,12 @@ from mopidy.utils import deps, process, versioning
 
 logger = logging.getLogger('mopidy.commands')
 
+_default_config = []
+for base in glib.get_system_config_dirs() + (glib.get_user_config_dir(),):
+    _default_config.append(os.path.join(base, b'mopidy', b'mopidy.conf'))
+DEFAULT_CONFIG = b':'.join(_default_config)
+print DEFAULT_CONFIG
+
 
 def config_files_type(value):
     return value.split(b':')
@@ -243,7 +250,7 @@ class RootCommand(Command):
         self.add_argument(
             '--config',
             action='store', dest='config_files', type=config_files_type,
-            default=b'$XDG_CONFIG_DIR/mopidy/mopidy.conf', metavar='FILES',
+            default=DEFAULT_CONFIG, metavar='FILES',
             help='config files to use, colon seperated, later files override')
         self.add_argument(
             '-o', '--option',