From 56ed74d620f8fbba5430642cf4ddbcb8b818b9a3 Mon Sep 17 00:00:00 2001
From: Andrew DeFaria <adefaria@audience.local>
Date: Wed, 2 Mar 2016 16:32:04 -0800
Subject: [PATCH] Final updates from Knowles.

---
 rc/bash_login | 17 +++++++++++++----
 rc/set_path   |  9 +++++----
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/rc/bash_login b/rc/bash_login
index 1084f41..53bccb9 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/}
@@ -146,9 +150,12 @@ set -o monitor
 set +u
 
 # Shell options
-shopt -s autocd
+if ! grep -qP '5\.(6|7|8|9|10)' /etc/*release; then
+  shopt -s autocd
+  shopt -s dirspell
+fi
+
 shopt -s cdspell
-shopt -s dirspell
 shopt -s histappend
 shopt -s lithist
 
@@ -265,7 +272,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
diff --git a/rc/set_path b/rc/set_path
index 8eaf9da..cccac0d 100644
--- a/rc/set_path
+++ b/rc/set_path
@@ -71,19 +71,20 @@ path_dirs="$path_dirs\
   /opt/Rational/Clearcase/bin\
   /opt/Rational/ClearQuest\
   /opt/Rational/Common\
-  /bin\
-  /sbin\
   /usr/local/mysql/bin\
   /usr/local/maps/bin\
+  /usr/local/ddts/bin\
+  /usr/local/bin\
   /usr/afsws/bin\
   /usr/afsws\
+  /bin\
+  /sbin\
   /usr/bin\
   /usr/X11R6/bin\
   /usr/bin/X11\
-  /usr/local/ddts/bin\
-  /usr/local/bin\
   /usr/dt/bin\
   /usr/openwin/bin\
+  /usr/kerberos/bin\
   /opt/rational/clearcase/bin\
   /opt/ibm/rationalsdlc/clearcase/bin\
   /opt/ibm/rationalsdlc/clearcase/etc\
-- 
2.17.1