Merge pull request #490 from tmux-python/issue_475_fix

Set XDG_CONFIG_HOME tmux config path correctly if XDG_CONFIG_HOME in use

Author: kstilwell

tests/test_cli.py

@@ -120,6 +120,13 @@ def test_tmuxp_configdir_env_var(tmpdir, monkeypatch):
     assert get_config_dir() == tmpdir
 
 
+def test_tmuxp_configdir_xdg_config_dir(tmpdir, monkeypatch):
+    monkeypatch.setenv('XDG_CONFIG_HOME', str(tmpdir))
+    tmux_dir = tmpdir.mkdir("tmuxp")
+
+    assert get_config_dir() == str(tmux_dir)
+
+
 def test_resolve_dot(tmpdir, homedir, configdir, projectdir, monkeypatch):
     monkeypatch.setenv('HOME', str(homedir))
     projectdir.join('.tmuxp.yaml').ensure()

tmuxp/cli.py

@@ -50,7 +50,7 @@ def get_config_dir():
     if 'TMUXP_CONFIGDIR' in os.environ:
         paths.append(os.environ['TMUXP_CONFIGDIR'])
     if 'XDG_CONFIG_HOME' in os.environ:
-        paths.append(os.environ['XDG_CONFIG_HOME'])
+        paths.append(os.path.join(os.environ['XDG_CONFIG_HOME'], 'tmuxp'))
     else:
         paths.append('~/.config/tmuxp/')
     paths.append('~/.tmuxp')