X-Git-Url: https://defaria.com/gitweb/?a=blobdiff_plain;f=rc%2Fbash_login;h=679307f55f649a28bdaa7b9ae546bedba0d616ef;hb=bf9722fcb29a115f0e8f7cf8314a5dac2e543e4e;hp=53bccb973aaec91d07997537ca2d47cdb2cb0366;hpb=28aaed87a992d0b6086bb355ad2c3f20eabd157e;p=clearscm.git

diff --git a/rc/bash_login b/rc/bash_login
index 53bccb9..679307f 100644
--- a/rc/bash_login
+++ b/rc/bash_login
@@ -41,6 +41,8 @@ elif [ $KERNEL = "SunOS" ]; then
   export ARCHITECTURE=sun
 elif [ $KERNEL = "FreeBSD" ]; then
   export ARCHITECTURE=$KERNEL
+elif [ $KERNEL = "Darwin" ]; then
+  export ARCHITECTURE=$KERNEL
 else
   export ARCHITECTURE=''
   echo "Warning: Unknown architecture ($KERNEL)"
@@ -150,9 +152,11 @@ set -o monitor
 set +u
 
 # Shell options
-if ! grep -qP '5\.(6|7|8|9|10)' /etc/*release; then
-  shopt -s autocd
-  shopt -s dirspell
+if [ $ARCHITECTURE != 'Darwin' ]; then
+  if ! grep -qP '5\.(6|7|8|9|10)' /etc/*release; then
+    shopt -s autocd
+    shopt -s dirspell
+  fi
 fi
 
 shopt -s cdspell
@@ -160,7 +164,7 @@ shopt -s histappend
 shopt -s lithist
 
 # Aliases:
-if [ $ARCHITECTURE = "FreeBSD" ]; then
+if [ $ARCHITECTURE = "FreeBSD" -o $ARCHITECTURE = "Darwin" ]; then
   alias ls="ls -FG"
 else
   if [ -f ~/.rc/dircolors ]; then
@@ -172,7 +176,7 @@ else
   if [ $ARCHITECTURE = "sun" ]; then
     # Ugh! --color doesn't work on braindead SUN
     alias ls="ls -F"
-  else        
+  else
     alias ls="ls -F --color=auto"
   fi
 fi
@@ -290,8 +294,8 @@ for script in $(\ls ~/.rc/client_scripts); do
 done
 
 # Set display to local
-export DISPLAY=${DISPLAY:-:0}
 
+export DISPLAY=${DISPLAY:-:0}
 # Reset home in case it changed
 HOME=$saved_home