config improvements

[code/myrepos.git] / mrconfig

diff --git a/mrconfig b/mrconfig
index 28a68b05d2d547af57a2efa447ff410a29e3cd76..57868f4be51ed61fad87702d6e982615b6b2a077 100644 (file)
--- a/mrconfig
+++ b/mrconfig
@@ -3,33 +3,51 @@
 [DEFAULT]
 # Teach mr how to run svn cleanup.
 cleanup = if [ -d "$MR_REPO"/.svn ]; then svn cleanup ; fi
+# And how to run git gc
+gc = if [ -d "$MR_REPO"/.git ]; then git gc; fi
 # Tests used in the skips below.
 # - wantsrc checks whether I probably want a full source checkout (quite
 #   large)
+# - private are hosts I trust private data to
 # - mylaptop only succeeds if it's on my main development laptop, which 
 #   gets lots of extra cruft
-lib = \
-       wantsrc() { \
-               test "$(whoami)" = joey; \
-       }; \
-       mylaptop() { \
-               test "$(hostname)" = kodama; \
-       }
+# - kite only succeeds on kite
+lib =                                                                  \
+       wantsrc() {                                                     \
+               test "$(whoami)" = joey                                 \
+       }                                                               \
+       private() {                                                     \
+               if [ "$(whoami)" = joey ]; then                         \
+                       case "$(hostname)" in                           \
+                       wren|kodama|dragon|dodo|bluebird)               \
+                               return 0                                \
+                       ;;                                              \
+                       esac                                            \
+               fi                                                      \
+               return 1                                                \
+       }                                                               \
+       mylaptop() {                                                    \
+               test "$(hostname)" = kodama                             \
+       }                                                               \
+       kite() {                                                        \
+               test "$(hostname)" = wren                               \
+       }                                                               \
 
 [src/mr]
-checkout = git clone ssh://kitenet.net/srv/git/kitenet.net/mr
+checkout = git clone ssh://git.kitenet.net/srv/git/kitenet.net/mr
 skip = ! wantsrc
 
 [src/linux-2.6]
 checkout = git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
-skip = ! mylaptop || ! wantsrc
+skip = ! mylaptop || ! wantsrc || \
+       ([ "$1" = update ] && [ $(hours_since "$1") -lt 12 ])
 
 [src/dpkg]
 # A merge of the upstream dpkg git repo and my own personal branch.
 checkout = \
        git clone git://git.debian.org/git/dpkg/dpkg.git && \
        cd dpkg && \
-       git remote add kite ssh://kitenet.net/srv/git/kitenet.net/dpkg && \
+       git remote add kite ssh://git.kitenet.net/srv/git/kitenet.net/dpkg && \
        git fetch kite && \
        git checkout -b sourcev3 kite/sourcev3
 update = git pull origin master && git pull kite sourcev3
@@ -45,6 +63,22 @@ checkout = \
 # and only rarely
 update = echo "skipping cvs update (too slow)"
 status = echo "skipping cvs status (too ugly)"
+skip = ! mylaptop || ! wantsrc
+
+[src/packages/uqm]
+checkout = git clone ssh://git.kitenet.net/srv/git/kitenet.net/uqm
+skip = ! wantsrc
+
+[src/packages/uqm-content]
+checkout = git clone ssh://git.kitenet.net/srv/git/kitenet.net/uqm-content
+skip = ! wantsrc
+
+[src/packages/uqm-voice]
+checkout = git clone ssh://git.kitenet.net/srv/git/kitenet.net/uqm-voice
+skip = ! wantsrc
+
+[src/packages/uqm-music]
+checkout = git clone ssh://git.kitenet.net/srv/git/kitenet.net/uqm-music
 skip = ! wantsrc
 
 # My home directory, which I keep in svn.
@@ -52,3 +86,15 @@ skip = ! wantsrc
 checkout = svn co svn+ssh://svn.kitenet.net/srv/svn/joey/trunk/home-$(hostname) joey
 # run svnfix after each update
 update = svn update && svnfix
+
+[mail]
+checkout = git clone ssh://git.kitenet.net/srv/git/kitenet.net/joey/private/mail
+skip = ! private
+
+[doc]
+checkout = git clone ssh://git.kitenet.net/srv/git/kitenet.net/joey/private/doc
+skip = ! private
+
+[lib/text]
+checkout = git clone ssh://git.kitenet.net/srv/git/kitenet.net/joey/private/text
+skip = ! wantmedia