X-Git-Url: https://defaria.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=rc%2Fbash_login;h=63c4e38d3268ab281e7ae88fe0a9d214b67f8a31;hb=c3cf58d21fbf17e2a69ed7cd6e56a198e7252c63;hp=c59c2b7950c44da5c0267d75bde617275202e1e3;hpb=ed09d3e6cfee4750b6af971bc1baea940b5800ba;p=clearscm.git diff --git a/rc/bash_login b/rc/bash_login index c59c2b7..63c4e38 100644 --- a/rc/bash_login +++ b/rc/bash_login @@ -315,7 +315,13 @@ for script in $(\ls ~/.rc/client_scripts); do # 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 + 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 @@ -324,8 +330,8 @@ done set_prompt # Set display to local - export DISPLAY=${DISPLAY:-:0} + # Reset home in case it changed HOME=$saved_home