X-Git-Url: https://defaria.com/gitweb/?a=blobdiff_plain;f=rc%2Fbash_login;h=4596387a999df0d5371969c8257542352e07e346;hb=b02e05b4efd5224a53c762942929b75ae215e237;hp=2d31fb8c127cb0630a35888c18df02cd0e8ef1b9;hpb=bdb1e0c845a6921e22d52fbff3404d5c1dfae520;p=clearscm.git

diff --git a/rc/bash_login b/rc/bash_login
index 2d31fb8..4596387 100644
--- a/rc/bash_login
+++ b/rc/bash_login
@@ -78,6 +78,7 @@ else
 fi
 
 export VISUAL=vi
+export EDITOR=vi
 
 # Terminal settings:
 if [ "$TERM" = ""        -o \
@@ -100,7 +101,7 @@ fi
 umask 002
 
 if [ "$interactive" = "true" ]; then
-  stty tostop intr ^C kill ^X susp ^Z erase ^H -inpck -istrip -ixany -echok -echonl
+  stty tostop intr ^C kill ^X susp ^Z erase ^? -inpck -istrip -ixany -echok -echonl
 fi
 
 # Set adm_base
@@ -119,11 +120,16 @@ fi
 # Source bash_completion (if present) (too slow for Windows)
 if [ -r /etc/bash_completion -a $ARCHITECTURE != "cygwin" ]; then
   source /etc/bash_completion
+elif [ -r /usr/local/etc/bash_completion ]; then
+  source /usr/local/etc/bash_completion
 fi
 
-# Alias ping
+# Windows aliases
 if [ $ARCHITECTURE = "cygwin" ]; then
   alias ping=$(echo $SYSTEMROOT | tr '\\' '\/')/system32/ping
+  alias rdp=mstsc
+else
+  alias sys=systemctl
 fi
 
 # We specify /home/$USER here so that when we sudo to another user 
@@ -242,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"
@@ -304,11 +310,22 @@ 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 [[ $(/bin/hostname -i) =~ 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