X-Git-Url: https://defaria.com/gitweb/?a=blobdiff_plain;f=rc%2Fbash_login;h=c59c2b7950c44da5c0267d75bde617275202e1e3;hb=58af866ac0275e68341eea9dbcaf580ccef97e0b;hp=8207eaee0d42aa94090dc086d4a1e03131baa8ca;hpb=201c4691639017573d7caf7bf03de6bf12db6614;p=clearscm.git diff --git a/rc/bash_login b/rc/bash_login index 8207eae..c59c2b7 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,10 +120,23 @@ 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 -if [ -x ~/.rc/logout ]; then - trap "~/.rc/logout" 0 +# 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 +# we will only trap logout if that user also has a ~/.rc/logout +# (doubtfull). +if [ -x /home/$USER/.rc/logout ]; then + trap "/home/$USER/.rc/logout" 0 fi # ClearCase Stuff @@ -234,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" @@ -296,8 +310,19 @@ 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 prompt as client customization may have changed things +set_prompt + # Set display to local export DISPLAY=${DISPLAY:-:0}