fix up paths and lookups

diff --git a/.config/mr/base-config.d/git.vcsh b/.config/mr/base-config.d/git.vcsh
index 922353bbbd52564af167868a1f52f15f03f65d49..64efe7d04f27ed0144a9b41b59ae139351ffc5ed 100644 (file)
--- 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
 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 d2857867ff563ca67b9ed52ee114ead9cc8b6adf..e7238fd7522a1feffae83ebd7a7c9f6cda2093c9 100644 (file)
--- 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
 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 0dbce4d77d116d13aec36d4590bd80bb126af1a0..03bfddc21d5e87699b209c50132b5481a898be97 100644 (file)
--- 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
 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 86144acc1db6942af552bd5d364930bce2cb0572..ba0942ffdd081c7357f4b128acb7fb7f4af5ee65 100644 (file)
--- 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
 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 58ffa9c138aace85077245a29b339361a57228f2..edb3e50d7cb8cea5631dae76d8e189b84ae9c611 100644 (file)
--- 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
 checkout = vcsh clone madduck:pub/etc/zsh.git

diff --git a/.mrconfig b/.mrconfig
index d55f559df841e5a95ff685a1850f7e228d2fcfdf..1c1e3eeb9b84e547e74ba69ac00079b900e0efdc 100644 (file)
--- a/.mrconfig
+++ b/.mrconfig
@@ -1,2 +1,3 @@
 [DEFAULT]
 [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]* || :