X-Git-Url: https://git.madduck.net/etc/myrepos.git/blobdiff_plain/514e19c48dc8894a83bd815a79de449da70e1139..dd2897b6650b70fb32f1d4dba4abdf9b51a05cb0:/.mr/base?ds=sidebyside

diff --git a/.mr/base b/.mr/base
index 094880c..059b590 100644
--- a/.mr/base
+++ b/.mr/base
@@ -1,46 +1,49 @@
 [.fgits/mr.git]
-checkout = git_fake_bare_checkout 'ssh://git.madduck.net/~/git/pub/etc/mr.git' 'mr.git' '../../'
+checkout = git_fake_bare_checkout 'ssh://git.madduck.net/madduck/pub/etc/mr.git' 'mr.git' '../../'
 
 [.fgits/ssh.git]
-checkout = git_fake_bare_checkout 'ssh://git.madduck.net/~/git/pub/etc/ssh.git' 'ssh.git' '../../' && make -C ~/.ssh
+checkout = git_fake_bare_checkout 'ssh://git.madduck.net/madduck/pub/etc/ssh.git' 'ssh.git' '../../' && make -C ~/.ssh
 update = GIT_DIR=$MR_REPO git pull "$@" && make -C ~/.ssh
 
 [.fgits/git.git]
-checkout = git_fake_bare_checkout 'ssh://git.madduck.net/~/git/pub/etc/git.git' 'git.git' '../../'
+checkout = git_fake_bare_checkout 'ssh://git.madduck.net/madduck/pub/etc/git.git' 'git.git' '../../'
 
 [.fgits/zsh.git]
-checkout = git_fake_bare_checkout 'ssh://git.madduck.net/~/git/pub/etc/zsh.git' 'zsh.git' '../../'
+checkout = git_fake_bare_checkout 'ssh://git.madduck.net/madduck/pub/etc/zsh.git' 'zsh.git' '../../'
 
 [.fgits/vim.git]
-checkout = git_fake_bare_checkout 'ssh://git.madduck.net/srv/git/git.madduck.net/pub/etc/vim.git' 'vim.git' '../../'
+checkout = git_fake_bare_checkout 'ssh://git.madduck.net/madduck/pub/etc/vim.git' 'vim.git' '../../'
 
 [.fgits/screen.git]
-checkout = git_fake_bare_checkout 'ssh://git.madduck.net/srv/git/git.madduck.net/pub/etc/screen.git' 'screen.git' '../../'
+checkout = git_fake_bare_checkout 'ssh://git.madduck.net/madduck/pub/etc/screen.git' 'screen.git' '../../'
 
 [.fgits/crontab.git]
-checkout = git_fake_bare_checkout 'ssh://git.madduck.net/srv/git/git.madduck.net/pub/etc/crontab.git' 'crontab.git' '../../' && make -C ~/.crontab.d
+checkout = git_fake_bare_checkout 'ssh://git.madduck.net/madduck/pub/etc/crontab.git' 'crontab.git' '../../' && make -C ~/.crontab.d
 update = GIT_DIR=$MR_REPO git pull "$@" && make -C ~/.crontab.d
 
 [.fgits/a2ps.git]
-checkout = git_fake_bare_checkout 'ssh://git.madduck.net/srv/git/git.madduck.net/pub/etc/a2ps.git' 'a2ps.git' '../../'
+checkout = git_fake_bare_checkout 'ssh://git.madduck.net/madduck/pub/etc/a2ps.git' 'a2ps.git' '../../'
 
 [.fgits/top.git]
-checkout = git_fake_bare_checkout 'ssh://git.madduck.net/srv/git/git.madduck.net/pub/etc/top.git' 'top.git' '../../'
+checkout = git_fake_bare_checkout 'ssh://git.madduck.net/madduck/pub/etc/top.git' 'top.git' '../../'
 
 [code/mr]
 checkout = checkout_hack_branch mr \
         joeyh git://git.kitenet.net/mr \
-        ssh://git.madduck.net/~/git/pub/code/mr.git
+        ssh://git.madduck.net/madduck/pub/code/mr.git
         ln -fs ../code/mr/mr ~/.bin/mr
         git branch vcsh origin/vcsh
 update = case "$(git config --get remote.origin.url)" in
-           *git.madduck.net*) git pull "$@";;
+           *git.madduck.net*|madduck:*)
+              git branch -D fu 2>/dev/null || :
+              git branch -r -d origin/fu 2>/dev/null || :
+              git pull "$@";;
            *) git remote add joeyh git://git.kitenet.net/mr || :
               git fetch joeyh
               git checkout -b joeyh joeyh/master || :
               git branch -d master || :
               git remote rm origin || :
-              git remote add origin ssh://git.madduck.net/~/git/pub/code/mr.git
+              git remote add origin ssh://git.madduck.net/madduck/pub/code/mr.git
               git fetch origin
               git branch master origin/master
               git checkout -b vcsh origin/vcsh
@@ -48,4 +51,4 @@ update = case "$(git config --get remote.origin.url)" in
          esac
 
 [code/mrsetup]
-checkout = git clone ssh://git.madduck.net/~/git/pub/etc/mrsetup.git mrsetup
+checkout = git clone ssh://git.madduck.net/madduck/pub/etc/mrsetup.git mrsetup