Fixed to remove call to sh-script.el

[clearscm.git] / rc / bash_login

diff --git a/rc/bash_login b/rc/bash_login
index 679307f..c8807d0 100644 (file)
--- a/rc/bash_login
+++ b/rc/bash_login
@@ -154,8 +154,8 @@ set +u
 # Shell options
 if [ $ARCHITECTURE != 'Darwin' ]; then
   if ! grep -qP '5\.(6|7|8|9|10)' /etc/*release; then
-    shopt -s autocd
-    shopt -s dirspell
+    shopt -s autocd   > /dev/null 2>&1
+    shopt -s dirspell > /dev/null 2>&1
   fi
 fi
 
@@ -203,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
@@ -215,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
@@ -299,6 +300,9 @@ 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