X-Git-Url: https://defaria.com/gitweb/?a=blobdiff_plain;f=rc%2Fbash_login;h=63c4e38d3268ab281e7ae88fe0a9d214b67f8a31;hb=c3cf58d21fbf17e2a69ed7cd6e56a198e7252c63;hp=e17473891efcdf3cb4e6d91c46b3278e8cef40d9;hpb=64e73c7c9b6ae49d19515b5737fe227f40a64a21;p=clearscm.git

diff --git a/rc/bash_login b/rc/bash_login
index e174738..63c4e38 100644
--- a/rc/bash_login
+++ b/rc/bash_login
@@ -248,7 +248,7 @@ if [ "$TERM" = "hpterm"         -o \
 fi
 
 # Miscellaneous:
-if [ -x $(type -p less) ]; then
+if type -p less > /dev/null; then
    export LESS=eiXP"?f%f :[stdin] .?pt(%pt\%):?bt(%bt bytes):-.."
    alias more="less -sr"
    export PAGER="less -sr"
@@ -310,11 +310,28 @@ for script in $(\ls ~/.rc/client_scripts); do
      ! -d ~/.rc/client_scripts/$script ]; then
     source ~/.rc/client_scripts/$script
   fi
+
+  # Special case for cPanel. Above relies on just the execute bit but
+  # git tracks mode. So we can't have it executable while at home. So
+  # instead we will look if we are on a 10. network (i.e. at cPanel)
+  # verses a 192. network at home.
+  if [ $ARCHITECTURE = 'Darwin' ]; then
+    ip=$(ipconfig getifaddr en0)
+  else
+    ip=$(/bin/hostname -i)
+  fi
+
+  if [[ $ip =~ 10\. && $script = "cPanel" ]]; then
+    source ~/.rc/client_scripts/$script
+  fi
 done
 
-# Set display to local
+# Set prompt as client customization may have changed things
+set_prompt
 
+# Set display to local
 export DISPLAY=${DISPLAY:-:0}
+
 # Reset home in case it changed
 HOME=$saved_home