From 0cd235eef674540b7001f15681c97d7dd8e6cb13 Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Tue, 29 Nov 2011 20:13:06 +0100 Subject: Use freedesktop.org mandated user config file location (Suggested by Tyll in #231) --- youtube_dl/__init__.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'youtube_dl/__init__.py') diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py index 3fba08fa4..fa2bd4fca 100755 --- a/youtube_dl/__init__.py +++ b/youtube_dl/__init__.py @@ -4125,7 +4125,12 @@ def parseOpts(): parser.add_option_group(authentication) parser.add_option_group(postproc) - argv = _readOptions('/etc/youtube-dl.conf') + _readOptions(os.path.expanduser('~/.youtube-dl.conf')) + sys.argv[1:] + xdg_config_home = os.environ.get('XDG_CONFIG_HOME') + if xdg_config_home: + userConf = os.path.join(xdg_config_home, 'youtube-dl.conf') + else: + userConf = os.path.join(os.path.expanduser('~'), '.config', 'youtube-dl.conf') + argv = _readOptions('/etc/youtube-dl.conf') + _readOptions(userConf) + sys.argv[1:] opts, args = parser.parse_args(argv) return parser, opts, args -- cgit v1.2.3