X-Git-Url: https://defaria.com/gitweb/?a=blobdiff_plain;f=rc%2Fbash_login;h=f7adefd3857490f80e7dc8a2c3aa586fd34edee3;hb=HEAD;hp=4cfce77002bd371e7728f5303ef48fccaeec945f;hpb=2e480180c50139e696c87f88f1b15da446b796aa;p=clearscm.git diff --git a/rc/bash_login b/rc/bash_login index 4cfce77..f7adefd 100644 --- a/rc/bash_login +++ b/rc/bash_login @@ -201,6 +201,7 @@ fi alias ll="ls -la" alias whence="type -p" alias mroe=more +alias gti=git if [ $ARCHITECTURE = "cygwin" ]; then alias host=nslookup @@ -310,14 +311,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 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