From: tfheen <tfheen@8da78d58-1cd3-0310-bee5-d77bd1b3e8bf>
Date: Tue, 9 Mar 2004 00:01:55 +0000 (+0000)
Subject: Handle zsh on fbsd
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b2add6e839823d8dc4721a875ed04892e582c6da;p=dotfiles

Handle zsh on fbsd

git-svn-id: file:///svn/tfheen/trunk/dotfiles@472 8da78d58-1cd3-0310-bee5-d77bd1b3e8bf
---

diff --git a/environment b/environment
index 2749c3d..f1a5d23 100644
--- a/environment
+++ b/environment
@@ -6,7 +6,7 @@ for lsopt in -B --color=auto -FN; do
     ls $lsopt > /dev/null 2>&1 && LS_OPTIONS="$LS_OPTIONS $lsopt"
 done
 
-if [ `uname -s` = "FreeBSD" ] && alias | grep -q "alias ls"; then
+if [ `uname -s` = "FreeBSD" ] && alias | grep -q "ls="; then
     unalias ls
 fi
 
diff --git a/zshrc b/zshrc
index 32559fa..7b75b55 100644
--- a/zshrc
+++ b/zshrc
@@ -8,14 +8,23 @@ alias mkdir='nocorrect mkdir' # no spelling correction on mkdir
 bindkey -e      # Emacs-style commandline editing
 
 PROMPT=': %U%n@%m%u %B%30<..<%~%b %(!.#.>) '
-case "$TERM" in
-    linux|*xterm*|ansi|linux-lat|screen)
-        alias ls="ls --color=tty -FN $LS_OPTIONS"
-;;
-    *) 
-        alias ls="ls -FN $LS_OPTIONS"
-;;
+
+case `uname -s` in
+    "FreeBSD")
+        :
+        ;;
+    *)
+        case "$TERM" in
+            linux|*xterm*|ansi|linux-lat|screen)
+                alias ls="ls --color=tty -FN $LS_OPTIONS"
+                ;;
+            *) 
+                alias ls="ls -FN $LS_OPTIONS"
+                ;;
+        esac
+        ;;
 esac
+
 alias mirror="wget --mirror --no-parent --convert-links -P $HOME/data/www-mirror "
 # The following lines were added by compinstall