X-Git-Url: https://defaria.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=rc%2Fbash_login;h=f7adefd3857490f80e7dc8a2c3aa586fd34edee3;hb=HEAD;hp=4596387a999df0d5371969c8257542352e07e346;hpb=c2102e8a98394bbac2af944b90993f86ad4d3742;p=clearscm.git diff --git a/rc/bash_login b/rc/bash_login index 4596387..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 @@ -315,7 +316,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