X-Git-Url: https://defaria.com/gitweb/?a=blobdiff_plain;f=rc%2Fbash_login;h=c8807d02b12f21186ad29ca3d688c74539db7ba1;hb=789e78564829765f3da4d9d6ff55b9394acdf4fc;hp=53bccb973aaec91d07997537ca2d47cdb2cb0366;hpb=56ed74d620f8fbba5430642cf4ddbcb8b818b9a3;p=clearscm.git

diff --git a/rc/bash_login b/rc/bash_login
index 53bccb9..c8807d0 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   > /dev/null 2>&1
+    shopt -s dirspell > /dev/null 2>&1
+  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
@@ -199,11 +203,11 @@ else
   export LANG=C
 fi
 
-if [ $(type -p vim) ]; then
+if [ "$(type -p vim)" ]; then
   alias vi=vim
 fi
 
-if [ $(type -p ncftp) ]; then
+if [ "$(type -p ncftp)" ]; then
   alias ftp=ncftp
   alias ftpput=ncftpput
   alias ftpget=ncftpget
@@ -211,13 +215,14 @@ fi
 
 #alias grep="grep -d skip"
 
-if [ "$TERM" = "hpterm"    -o \
-     "$TERM" = "hp"        -o \
-     "$TERM" = "dtterm"    -o \
-     "$TERM" = "sun-color" -o \
-     "$TERM" = "vt100"     -o \
-     "$TERM" = "vt220"     -o \
-     "$TERM" = "xterm"     -o \
+if [ "$TERM" = "hpterm"         -o \
+     "$TERM" = "hp"             -o \
+     "$TERM" = "dtterm"         -o \
+     "$TERM" = "sun-color"      -o \
+     "$TERM" = "vt100"          -o \
+     "$TERM" = "vt220"          -o \
+     "$TERM" = "xterm"          -o \
+     "$TERM" = "xterm-256color" -o \
      "$TERM" = "cygwin" ]; then
   alias cd=mycd
   alias pushd=mypushd
@@ -290,11 +295,14 @@ 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
 
+# Odd but Eclipse's Egit can't seem to work with defaria.com unless this is set.
+export GIT_SSH=/usr/bin/ssh
+
 # Now go home (in case we were not autmatically cd'ed there)
 if [ $(id -u) -ne 0 ]; then
   cd