From 14cc81b82cb640c7cb91b2d3063769ab04cf3280 Mon Sep 17 00:00:00 2001
From: Colin Patrick McCabe <cmccabe@alumni.cmu.edu>
Date: Mon, 27 Sep 2010 10:33:55 -0700
Subject: [PATCH] .bashrc: test if ls --color works before aliasing

---
 .bashrc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/.bashrc b/.bashrc
index 6e3606e..b0df65b 100644
--- a/.bashrc
+++ b/.bashrc
@@ -23,7 +23,7 @@ xlock2() {
 case $- in
 *i*)
 	# interactive shell
-	alias ls='ls --color=auto'
+        ls --color /tmp &>/dev/null && alias ls='ls --color=auto'
 	alias mv='mv -i'
 	alias vi='vim'
 	alias wget='wget --user-agent="Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1)"'
-- 
1.6.6.rc1.39.g9a42