X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=dot%2Fconfigs%2Fsetenvir;h=86401e7ec7e7b76523e715b1d47bd0b2e59dcc1a;hb=771b1ad2e9b29c5b9e036b16591dacc1576e49b5;hp=68179d32bfddeebfddebd28dc1d963acda38eade;hpb=dd8f891e03958a3aecc8e4004c5de01f2fdb8c24;p=ian-dotfiles.git

diff --git a/dot/configs/setenvir b/dot/configs/setenvir
index 68179d3..86401e7 100644
--- a/dot/configs/setenvir
+++ b/dot/configs/setenvir
@@ -7,22 +7,6 @@ PATH=$HOME/personal/linux-i386/bin:$HOME/personal/scripts/bin
 CVS_RSH=ssh
 
 
-case "$(hostname -f)" in
-*.xensource.com) ;;
-	GIT_COMMITTER_EMAIL=Ian.Jackson@eu.citrix.com
-	export GIT_COMMITTER_EMAIL
-	NNTPAUTH="md5cookie1way ijacksonxen"
-	NNTPSERVER=tunnel.chiark.greenend.org.uk
-	export NNTPAUTH NNTPSERVER
-*)
-        EMAIL=ijackson@chiark.greenend.org.uk
-        DEBEMAIL=ijackson@chiark.greenend.org.uk
-        ;;
-esac
-
-
-
-
 PATH=$PATH:/usr/lib/ccache
 PATH=$PATH:/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/sbin:/usr/sbin
 PATH=$PATH:/usr/lib/git-core
@@ -41,6 +25,21 @@ unset MAILPATH
 
 
 
+case "$(hostname -f)" in
+*.xensource.com)
+	NNTPAUTH="md5cookie1way ijacksonxen"
+	NNTPSERVER=tunnel.chiark.greenend.org.uk
+	export NNTPAUTH NNTPSERVER
+	;;
+*)
+        EMAIL=ijackson@chiark.greenend.org.uk
+        DEBEMAIL=ijackson@chiark.greenend.org.uk
+        ;;
+esac
+
+
+
+
 
 
 EDITOR=emacs
@@ -69,6 +68,14 @@ if test -d /mariner64; then
 fi
 
 
+if [ "x$debian_chroot" = x ] && test -f /etc/debian_chroot; then
+	read </etc/debian_chroot debian_chroot
+	debian_chroot="($debian_chroot)"
+	export debian_chroot
+fi
+
+
+
 unset ignoreeof
 
 umask 002