X-Git-Url: https://defaria.com/gitweb/?a=blobdiff_plain;f=rc%2Fbash_login;h=679307f55f649a28bdaa7b9ae546bedba0d616ef;hb=6692e348877522452e26fb980b0b4c74fc375d9f;hp=1084f41a5771c475849e0f88d135c79d578cd84a;hpb=09d1aebd49467f5d146d58309d8b646e57ef582f;p=clearscm.git

diff --git a/rc/bash_login b/rc/bash_login
index 1084f41..679307f 100644
--- a/rc/bash_login
+++ b/rc/bash_login
@@ -16,7 +16,11 @@
 # when I become root with sudo -s and what a better environment that the bare
 # bones root environment gives you. Note that for us to be effective one must
 # source (or .) this file and if so the ${BASH_ARGV[0]} is the normal $0
-home=$(dirname ${BASH_ARGV[0]})
+if [ -n "${BASH_ARGV[0]}" ]; then
+  home=$(dirname ${BASH_ARGV[0]})
+else
+  home=$HOME
+fi
 
 # Strip off .rc
 home=${home/%\/\.rc/}
@@ -37,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)"
@@ -146,14 +152,19 @@ set -o monitor
 set +u
 
 # Shell options
-shopt -s autocd
+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
-shopt -s dirspell
 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
@@ -165,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
@@ -265,7 +276,9 @@ if [ -d /opt/clearscm/lib ]; then
 fi
 
 # Lessfile
-eval $(lessfile)
+if type lessfile > /dev/null 2>&1; then
+  eval $(lessfile)
+fi
 
 # Client specific customizations
 for script in $(\ls ~/.rc/client_scripts); do
@@ -281,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