X-Git-Url: https://defaria.com/gitweb/?a=blobdiff_plain;f=rc%2Fbash_login;h=ff64550bdc75802346ae65ab3aa0cadf07e2511d;hb=d266a5541890effba039977967bf046ea2e0f35b;hp=1a904f9ad2f048e04786f04c080353e6ab223471;hpb=020a4a5ea2be725b155cae3a2cadc9aba3911b9b;p=clearscm.git

diff --git a/rc/bash_login b/rc/bash_login
old mode 100755
new mode 100644
index 1a904f9..ff64550
--- a/rc/bash_login
+++ b/rc/bash_login
@@ -1,7 +1,7 @@
 ################################################################################
 #
 # File:         $RCSfile: bash_login,v $
-# Revision:	$Revision: 1.29 $
+# Revision:	    $Revision: 1.29 $
 # Description:  bash startup file
 # Author:       Andrew@DeFaria.com
 # Created:      Mon Aug 20 17:35:01  2001
@@ -11,23 +11,23 @@
 # (c) Copyright 2000-2005, Andrew@DeFaria.com, all rights reserved.
 #
 ################################################################################
-# Set ARCH, architecture of the machine
+# Set ARCHITECTURE of the machine
 KERNEL=$(uname -s)
 if [[ $KERNEL = CYGWIN* ]]; then
-  export ARCH=cygwin
+  export ARCHITECTURE=cygwin
 elif [ $KERNEL = "Linux" ]; then
-  export ARCH=linux
+  export ARCHITECTURE=linux
 elif [ $KERNEL = "SunOS" ]; then
-  export ARCH=sun
+  export ARCHITECTURE=sun
 elif [ $KERNEL = "FreeBSD" ]; then
-  export ARCH=$KERNEL
+  export ARCHITECTURE=$KERNEL
 else
-  export ARCH=''
+  export ARCHITECTURE=''
   echo "Warning: Unknown architecture ($KERNEL)"
 fi
 
 # Architectual differences (AKA Silly Sun)
-if [ $ARCH = "sun" ]; then
+if [ $ARCHITECTURE = "sun" ]; then
   alias id=/usr/xpg4/bin/id
   alias tr=/usr/xpg4/bin/tr
   
@@ -70,7 +70,7 @@ fi
 
 # System dependencies
 # Note: I don't like doing this but an alias doesn't work...
-if [ $ARCH = "sun" ]; then
+if [ $ARCHITECTURE = "sun" ]; then
   id=/usr/xpg4/bin/id
 else
   id=id
@@ -96,12 +96,10 @@ else
 fi
 
 # Source bash_completion (if present) (too slow for Windows)
-if [ -r /etc/bash_completion -a $ARCH != "cygwin" ]; then
+if [ -r /etc/bash_completion -a $ARCHITECTURE != "cygwin" ]; then
   source /etc/bash_completion
 fi
 
-export CVSROOT=:ext:andrew@clearscm.com:/var/cvs/cvsroot
-
 if [ -x ~/.rc/logout ]; then
   trap "~/.rc/logout" 0
 fi
@@ -116,6 +114,11 @@ if [ -f ~/.rc/multisite ]; then
   source ~/.rc/multisite
 fi
 
+# Git Stuff
+if [ -f ~/.rc/git ]; then
+  source ~/.rc/git
+fi
+
 # Import shell functions:
 if [ -f ~/.rc/functions ]; then
   source ~/.rc/functions
@@ -129,7 +132,7 @@ set +u
 shopt -s lithist
 
 # Aliases:
-if [ $ARCH = "FreeBSD" ]; then
+if [ $ARCHITECTURE = "FreeBSD" ]; then
   alias ls="ls -FG"
 else
   if [ -f ~/.rc/dircolors ]; then
@@ -138,7 +141,7 @@ else
     fi
   fi
 
-  if [ $ARCH = "sun" ]; then
+  if [ $ARCHITECTURE = "sun" ]; then
     # Ugh! --color doesn't work on braindead SUN
     alias ls="ls -F"
   else
@@ -150,7 +153,7 @@ alias ll="ls -la"
 alias whence="type -p"
 alias mroe=more
 
-if [ $ARCH = "cygwin" ]; then
+if [ $ARCHITECTURE = "cygwin" ]; then
   alias host=nslookup
 fi
 
@@ -223,6 +226,11 @@ fi
 # Color man pages with yellow keywords
 export LESS_TERMCAP_md=$'\e[1;33m'
 
+# If /opt/clearscm/lib is around then set PERL5LIB
+if [ -d /opt/clearscm/lib ]; then
+  export PERL5LIB="$PERL5LIB:/opt/clearscm/lib"
+fi
+
 # Client specific customizations
 for script in $(\ls ~/.rc/client_scripts); do
   # This is not working as long as ACLs are not supported from the remote