From: Andrew DeFaria Date: Tue, 21 Mar 2023 17:24:27 +0000 (+0000) Subject: Merge branch 'master' of https://github.com/adefaria/clearscm X-Git-Url: https://defaria.com/gitweb/?a=commitdiff_plain;h=HEAD;hp=7ddf095f187ca60d9a70fb83b2bc3c2b6d91f088;p=clearscm.git Merge branch 'master' of https://github.com/adefaria/clearscm --- diff --git a/rc/bash_login b/rc/bash_login index bd91f1c..f7adefd 100644 --- a/rc/bash_login +++ b/rc/bash_login @@ -316,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