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 2749c3d16b59ce0f7c24f03228bfaaa21254f773..f1a5d2308edb9b297ed9ffa67a610fb1f1bc4645 100644 (file)
--- 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 32559fad63c21c99f7e378fa2385b619b0ad3984..7b75b55a0c18790113699e53c24b4b99482f9b75 100644 (file)
--- 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