X-Git-Url: https://defaria.com/gitweb/?a=blobdiff_plain;f=rc%2Fbash_login;h=c8807d02b12f21186ad29ca3d688c74539db7ba1;hb=fc7084ebcc37d27c78195c12f2d18a07801340ab;hp=8e47493cd1d9dede947b42e3c17ace5ca56c7d32;hpb=5ed6aa97576a9eb55c92f92f010ddd0b135b8f9e;p=clearscm.git diff --git a/rc/bash_login b/rc/bash_login index 8e47493..c8807d0 100644 --- 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 @@ -300,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