From: Andrew DeFaria <Andrew@DeFaria.com>
Date: Fri, 13 May 2016 21:43:06 +0000 (-0700)
Subject: Changes to start up scripts to work well for Mac.
X-Git-Url: https://defaria.com/gitweb/?a=commitdiff_plain;h=bf9722fcb29a115f0e8f7cf8314a5dac2e543e4e;p=clearscm.git

Changes to start up scripts to work well for Mac.
---

diff --git a/rc/bash_login b/rc/bash_login
index 53bccb9..679307f 100644
--- a/rc/bash_login
+++ b/rc/bash_login
@@ -41,6 +41,8 @@ elif [ $KERNEL = "SunOS" ]; then
   export ARCHITECTURE=sun
 elif [ $KERNEL = "FreeBSD" ]; then
   export ARCHITECTURE=$KERNEL
+elif [ $KERNEL = "Darwin" ]; then
+  export ARCHITECTURE=$KERNEL
 else
   export ARCHITECTURE=''
   echo "Warning: Unknown architecture ($KERNEL)"
@@ -150,9 +152,11 @@ set -o monitor
 set +u
 
 # Shell options
-if ! grep -qP '5\.(6|7|8|9|10)' /etc/*release; then
-  shopt -s autocd
-  shopt -s dirspell
+if [ $ARCHITECTURE != 'Darwin' ]; then
+  if ! grep -qP '5\.(6|7|8|9|10)' /etc/*release; then
+    shopt -s autocd
+    shopt -s dirspell
+  fi
 fi
 
 shopt -s cdspell
@@ -160,7 +164,7 @@ shopt -s histappend
 shopt -s lithist
 
 # Aliases:
-if [ $ARCHITECTURE = "FreeBSD" ]; then
+if [ $ARCHITECTURE = "FreeBSD" -o $ARCHITECTURE = "Darwin" ]; then
   alias ls="ls -FG"
 else
   if [ -f ~/.rc/dircolors ]; then
@@ -172,7 +176,7 @@ else
   if [ $ARCHITECTURE = "sun" ]; then
     # Ugh! --color doesn't work on braindead SUN
     alias ls="ls -F"
-  else        
+  else
     alias ls="ls -F --color=auto"
   fi
 fi
@@ -290,8 +294,8 @@ for script in $(\ls ~/.rc/client_scripts); do
 done
 
 # Set display to local
-export DISPLAY=${DISPLAY:-:0}
 
+export DISPLAY=${DISPLAY:-:0}
 # Reset home in case it changed
 HOME=$saved_home
 
diff --git a/rc/clearcase b/rc/clearcase
index f651231..f06a3e0 100644
--- a/rc/clearcase
+++ b/rc/clearcase
@@ -11,26 +11,9 @@
 # Modified:    $Date: 2011/10/24 18:07:05 $
 # Language:    bash
 #
-# (c) Copyright 2000-2011, ClearSCM, Inc., all rights reserved.
+# (c) Copyright 2000-2016, ClearSCM, Inc., all rights reserved.
 #
 ################################################################################
-# Set ARCHITECTURE of the machine
-KERNEL=$(uname -s)
-
-if [[ $KERNEL = CYGWIN* ]]; then
-  export ARCHITECTURE=cygwin
-  vobtagPrefix='\\\\\\\'
-elif [ $KERNEL = "Linux" ]; then
-  export ARCHITECTURE=linux
-elif [ $KERNEL = "SunOS" ]; then
-  export ARCHITECTURE=sun
-elif [ $KERNEL = "FreeBSD" ]; then
-  export ARCHITECTURE=$KERNEL
-else
-  export ARCHITECTURE=''
-  echo "Warning: Unknown architecture ($KERNEL)"
-fi
-
 if [ $ARCHITECTURE = 'cygwin' ]; then
   export CCHOME=$(cygpath -u "$(regtool get '/machine/SOFTWARE/Rational Software/RSINSTALLDIR' 2>/dev/null)"/Clearcase 2>/dev/null);
 else 
diff --git a/rc/client_scripts/Axcient b/rc/client_scripts/Axcient
index 918ed38..a450ee8 100644
--- a/rc/client_scripts/Axcient
+++ b/rc/client_scripts/Axcient
@@ -15,4 +15,4 @@
 export SMTPHOST=tesla3.axcient.inc
 export SMTPFROM=buildandrelease@axcient.com
 
-append_to_path /opt/brscripts/bin
+append_to_path /opt/axscripts/bin
diff --git a/rc/sshconfig b/rc/sshconfig
index 2fe4668..965139e 100644
--- a/rc/sshconfig
+++ b/rc/sshconfig
@@ -6,6 +6,12 @@ Host *
   ServerAliveInterval 300
   ServerAliveCountMax 2
 
-Host jira
-  HostName %h.audience.local
+Host home
+  Hostname defaria.com
+  User andrew
+
+Host defaria.com
+  User andrew
+
+Host *
   User adefaria
diff --git a/rc/system b/rc/system
index 88d1921..e92c7f1 100644
--- a/rc/system
+++ b/rc/system
@@ -20,3 +20,10 @@ SYSNAME=${SYSNAME%%\.*}
 
 # Set to initial cap
 SYSNAME=$(echo ${SYSNAME:0:1} | tr [:lower:] [:upper:])$(echo ${SYSNAME:1}   | tr [:upper:] [:lower:])
+
+# Aliasing
+case "$SYSNAME" in
+  Ande-4848)
+    SYSNAME="ADeFaria"
+    ;;
+esac
diff --git a/rc/vimrc b/rc/vimrc
index d71d4e2..30f650d 100644
--- a/rc/vimrc
+++ b/rc/vimrc
@@ -6,5 +6,5 @@ set nocompatible
 set backspace=indent,eol,start
 set hlsearch
 set ff=unix
-colorscheme slate
+colorscheme blue
 map!