X-Git-Url: https://git.madduck.net/etc/myrepos.git/blobdiff_plain/97e6a460eae6b3f1f68f771587a26b17891f8ec3..83a158f18cba5a4cc7eddfae392b9176d29edb3b:/.mr/base diff --git a/.mr/base b/.mr/base index 3fd8842..094880c 100644 --- a/.mr/base +++ b/.mr/base @@ -17,17 +17,34 @@ checkout = git_fake_bare_checkout 'ssh://git.madduck.net/srv/git/git.madduck.net [.fgits/screen.git] checkout = git_fake_bare_checkout 'ssh://git.madduck.net/srv/git/git.madduck.net/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 +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' '../../' + +[.fgits/top.git] +checkout = git_fake_bare_checkout 'ssh://git.madduck.net/srv/git/git.madduck.net/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 - 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 remote add joeyh git://git.kitenet.net/mr; \ - git remote update; \ - git checkout -b joeyh joeyh/master;; \ + joeyh git://git.kitenet.net/mr \ + ssh://git.madduck.net/~/git/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 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 fetch origin + git branch master origin/master + git checkout -b vcsh origin/vcsh + ;; esac [code/mrsetup]