X-Git-Url: https://defaria.com/gitweb/?a=blobdiff_plain;f=rc%2Fbash_login;h=b587bafb49e140d90b174b9e2e042a6b5e6249a1;hb=74fc3dcf5806f0c3ecd1851fca1e7233d99d1d8e;hp=4cfce77002bd371e7728f5303ef48fccaeec945f;hpb=2e480180c50139e696c87f88f1b15da446b796aa;p=clearscm.git diff --git a/rc/bash_login b/rc/bash_login index 4cfce77..b587baf 100644 --- a/rc/bash_login +++ b/rc/bash_login @@ -310,14 +310,27 @@ 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} + +# New tmp location +if [ -d /System/tmp ]; then + export TMP=/System/tmp +fi + # Reset home in case it changed HOME=$saved_home