From 4485a622887eafc6174b305983301aa6ea46d4c9 Mon Sep 17 00:00:00 2001
From: andrew <Andrew@ClearSCM.com>
Date: Wed, 31 Jul 2013 18:09:06 -0700
Subject: [PATCH] Fixed some more ARCHITECTUREs and stopped exporting colors
 from set_colors.

---
 rc/clearcase.conf |  4 +--
 rc/functions      |  2 +-
 rc/set_colors     | 92 +++++++++++++++++++++++------------------------
 3 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/rc/clearcase.conf b/rc/clearcase.conf
index aafc4cc..3e8c4f4 100644
--- a/rc/clearcase.conf
+++ b/rc/clearcase.conf
@@ -2,7 +2,7 @@
 # can set some variables if you like to represent site defaults
 
 # The vobtag prefix in use at this site
-if [ $ARCH = 'cygwin' ]; then
+if [ $ARCHITECTURE = 'cygwin' ]; then
   export VOBTAG_PREFIX=\\
 else 
   export VOBTAG_PREFIX=/vob/
@@ -18,4 +18,4 @@ export LINUX_VOBTAG_PREFIX=/vob
 export pvob=${VOBTAG_PREFIX}9200_projects
 
 # The default vob
-export dvob="${VOBTAG_PREFIX}9200"
\ No newline at end of file
+export dvob="${VOBTAG_PREFIX}9200"
diff --git a/rc/functions b/rc/functions
index 1f1636d..1801288 100644
--- a/rc/functions
+++ b/rc/functions
@@ -189,7 +189,7 @@ function ssh {
 } # ssh
 
 function sj {
-  if [ $ARCH = "FreeBSD" ]; then
+  if [ $ARCHITECTURE = "FreeBSD" ]; then
     psopts="-aux"
   else
     psopts="-ef"
diff --git a/rc/set_colors b/rc/set_colors
index 28c7a69..8681d99 100644
--- a/rc/set_colors
+++ b/rc/set_colors
@@ -12,55 +12,55 @@
 # (c) Copyright 2000-2005, Andrew@DeFaria.com, all rights reserved.
 #
 ################################################################################
-export esc=$(echo "\033")
+esc=$(echo "\033")
 
 if [ "$TERM" = "vt100" -o \
      "$TERM" = "vt220" ]; then
-  export NORMAL="$esc[0m"
-  export BOLD="$esc[1m"
-  export UNDERLINE="$esc[4m"
-  export BLINK="$esc[5m"
-  export INVERSE="$esc[7m"
+  NORMAL="$esc[0m"
+  BOLD="$esc[1m"
+  UNDERLINE="$esc[4m"
+  BLINK="$esc[5m"
+  INVERSE="$esc[7m"
 elif [ "$TERM" = "dtterm" -o "$TERM" = "vt100" -o "$TERM" = "xterm" -o -z DTTERM ]; then
-  export NORMAL="$esc[39m"
-  export RED="$esc[31m"
-  export B_RED=$RED
-  export GREEN="$esc[32m"
-  export B_GREEN=$GREEN
-  export YELLOW="$esc[33m"
-  export B_YELLOW=$YELLOW
-  export BLUE="$esc[34m"
-  export B_BLUE=$BLUE
-  export MAGENTA="$esc[35m"
-  export B_MAGENTA=$MAGENTA
-  export AQUA="$esc[36m"
-  export B_AQUA=$AQUA
-  export WHITE="$esc[36m"
-  export B_WHITE=$WHITE
+  NORMAL="$esc[39m"
+  RED="$esc[31m"
+  B_RED=$RED
+  GREEN="$esc[32m"
+  B_GREEN=$GREEN
+  YELLOW="$esc[33m"
+  B_YELLOW=$YELLOW
+  BLUE="$esc[34m"
+  B_BLUE=$BLUE
+  MAGENTA="$esc[35m"
+  B_MAGENTA=$MAGENTA
+  AQUA="$esc[36m"
+  B_AQUA=$AQUA
+  WHITE="$esc[36m"
+  B_WHITE=$WHITE
 elif [ "$TERM" = "hp" -o "$TERM" = "hpterm" ]; then
-  export NORMAL="$esc&d@$esc&v0S"
-  export RED="$esc&v1S"
-  export GREEN="$esc&v2S"
-  export YELLOW="$esc&v3S"
-  export BLUE="$esc&v4S"
-  export PURPLE="$esc&v5S"
-  export AQUA="$esc&v6S"
-  export HB_NORMAL="$esc&v0S$esc&dK"
-  export B_NORMAL="$esc&v0S$esc&dB"
-  export HB_RED="$esc&v1S$esc&dK"
-  export B_RED="$esc&v1S$esc&dB"
-  export HB_GREEN="$esc&v2S$esc&dK"
-  export B_GREEN="$esc&v2S$esc&dB"
-  export HB_YELLOW="$esc&v3S$esc&dK"
-  export B_YELLOW="$esc&v3S$esc&dB"
-  export HB_BLUE="$esc&v4S$esc&dK"
-  export B_BLUE="$esc&v4S$esc&dB"
-  export PURPLE="$esc&v5S"
-  export HB_PURPLE="$esc&v5S$esc&dK"
-  export B_PURPLE="$esc&v5S$esc&dB"
-  export HB_AQUA="$esc&v6S$esc&dK"
-  export B_AQUA="$esc&v6S$esc&dB"
-  export INVERSE="$esc&v7S"
-  export HB_INVERSE="$esc&v7S$esc&dK"
-  export B_INVERSE="$esc&v7S$esc&dB"
+  NORMAL="$esc&d@$esc&v0S"
+  RED="$esc&v1S"
+  GREEN="$esc&v2S"
+  YELLOW="$esc&v3S"
+  BLUE="$esc&v4S"
+  PURPLE="$esc&v5S"
+  AQUA="$esc&v6S"
+  HB_NORMAL="$esc&v0S$esc&dK"
+  B_NORMAL="$esc&v0S$esc&dB"
+  HB_RED="$esc&v1S$esc&dK"
+  B_RED="$esc&v1S$esc&dB"
+  HB_GREEN="$esc&v2S$esc&dK"
+  B_GREEN="$esc&v2S$esc&dB"
+  HB_YELLOW="$esc&v3S$esc&dK"
+  B_YELLOW="$esc&v3S$esc&dB"
+  HB_BLUE="$esc&v4S$esc&dK"
+  B_BLUE="$esc&v4S$esc&dB"
+  PURPLE="$esc&v5S"
+  HB_PURPLE="$esc&v5S$esc&dK"
+  B_PURPLE="$esc&v5S$esc&dB"
+  HB_AQUA="$esc&v6S$esc&dK"
+  B_AQUA="$esc&v6S$esc&dB"
+  INVERSE="$esc&v7S"
+  HB_INVERSE="$esc&v7S$esc&dK"
+  B_INVERSE="$esc&v7S$esc&dB"
 fi
-- 
2.17.1