From 9548f63f9d074df5aed9b72fa2410ee926bc810f Mon Sep 17 00:00:00 2001
From: "martin f. krafft" <madduck@madduck.net>
Date: Mon, 22 Apr 2013 22:44:09 +0200
Subject: [PATCH] fix up paths and lookups

---
 .config/mr/base-config.d/git.vcsh | 2 +-
 .config/mr/base-config.d/mr.vcsh  | 2 +-
 .config/mr/base-config.d/ssh.git  | 2 +-
 .config/mr/base-config.d/vim.git  | 2 +-
 .config/mr/base-config.d/zsh.git  | 2 +-
 .mrconfig                         | 3 ++-
 6 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.config/mr/base-config.d/git.vcsh b/.config/mr/base-config.d/git.vcsh
index 922353b..64efe7d 100644
--- a/.config/mr/base-config.d/git.vcsh
+++ b/.config/mr/base-config.d/git.vcsh
@@ -1,3 +1,3 @@
-[repo.d/git.git]
+[${XDG_CONFIG_HOME:-$HOME/.config}/vcsh/repo.d/git.git]
 checkout = vcsh clone ssh://git.madduck.net/madduck/pub/etc/git.git
 post_checkout = vcsh run git git config remote.origin.url madduck:pub/etc/git.git
diff --git a/.config/mr/base-config.d/mr.vcsh b/.config/mr/base-config.d/mr.vcsh
index d285786..e7238fd 100644
--- a/.config/mr/base-config.d/mr.vcsh
+++ b/.config/mr/base-config.d/mr.vcsh
@@ -1,2 +1,2 @@
-[repo.d/mr.git]
+[${XDG_CONFIG_HOME:-$HOME/.config}/vcsh/repo.d/mr.git]
 checkout = vcsh clone madduck:pub/etc/mr.git
diff --git a/.config/mr/base-config.d/ssh.git b/.config/mr/base-config.d/ssh.git
index 0dbce4d..03bfddc 100644
--- a/.config/mr/base-config.d/ssh.git
+++ b/.config/mr/base-config.d/ssh.git
@@ -1,4 +1,4 @@
-[repo.d/ssh.git]
+[${XDG_CONFIG_HOME:-$HOME/.config}/vcsh/repo.d/ssh.git]
 checkout = vcsh clone madduck:pub/etc/ssh.git
 post_checkout = for i in rewrite merge; do ln -rs $MR_REPO/../../hooks-available/ssh.post-run+enter $MR_REPO/hooks/post-$i; done
 fixups = $MR_REPO/../../hooks-available/ssh.post-run+enter
diff --git a/.config/mr/base-config.d/vim.git b/.config/mr/base-config.d/vim.git
index 86144ac..ba0942f 100644
--- a/.config/mr/base-config.d/vim.git
+++ b/.config/mr/base-config.d/vim.git
@@ -1,2 +1,2 @@
-[repo.d/vim.git]
+[${XDG_CONFIG_HOME:-$HOME/.config}/vcsh/repo.d/vim.git]
 checkout = vcsh clone madduck:pub/etc/vim.git
diff --git a/.config/mr/base-config.d/zsh.git b/.config/mr/base-config.d/zsh.git
index 58ffa9c..edb3e50 100644
--- a/.config/mr/base-config.d/zsh.git
+++ b/.config/mr/base-config.d/zsh.git
@@ -1,2 +1,2 @@
-[repo.d/zsh.git]
+[${XDG_CONFIG_HOME:-$HOME/.config}/vcsh/repo.d/zsh.git]
 checkout = vcsh clone madduck:pub/etc/zsh.git
diff --git a/.mrconfig b/.mrconfig
index d55f559..1c1e3ee 100644
--- a/.mrconfig
+++ b/.mrconfig
@@ -1,2 +1,3 @@
 [DEFAULT]
-include = cat $HOME/.config/mr/base-config.d/[a-z]* $HOME/.config/mr/config.d/[a-z]*
+include = ls ${XDG_CONFIG_HOME:-$HOME/.config}/mr/base-config.d/[a-z]* >/dev/null 2>&1 && cat $HOME/.config/mr/base-config.d/[a-z]* || :
+include = ls ${XDG_CONFIG_HOME:-$HOME/.config}/mr/config.d/[a-z]* >/dev/null 2>&1 && cat $HOME/.config/mr/config.d/[a-z]* || :
-- 
2.39.5