projects
/
clearscm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of defaria.com:/opt/git/clearscm
[clearscm.git]
/
rc
/
bash_login
diff --git
a/rc/bash_login
b/rc/bash_login
old mode 100755
(executable)
new mode 100644
(file)
index
1a904f9
..
79d1c60
--- a/
rc/bash_login
+++ b/
rc/bash_login
@@
-1,7
+1,7
@@
################################################################################
#
# File: $RCSfile: bash_login,v $
################################################################################
#
# 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
# 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.
#
################################################################################
# (c) Copyright 2000-2005, Andrew@DeFaria.com, all rights reserved.
#
################################################################################
-# Set ARCH
, architecture
of the machine
+# Set ARCH
ITECTURE
of the machine
KERNEL=$(uname -s)
if [[ $KERNEL = CYGWIN* ]]; then
KERNEL=$(uname -s)
if [[ $KERNEL = CYGWIN* ]]; then
- export ARCH=cygwin
+ export ARCH
ITECTURE
=cygwin
elif [ $KERNEL = "Linux" ]; then
elif [ $KERNEL = "Linux" ]; then
- export ARCH=linux
+ export ARCH
ITECTURE
=linux
elif [ $KERNEL = "SunOS" ]; then
elif [ $KERNEL = "SunOS" ]; then
- export ARCH=sun
+ export ARCH
ITECTURE
=sun
elif [ $KERNEL = "FreeBSD" ]; then
elif [ $KERNEL = "FreeBSD" ]; then
- export ARCH=$KERNEL
+ export ARCH
ITECTURE
=$KERNEL
else
else
- export ARCH=''
+ export ARCH
ITECTURE
=''
echo "Warning: Unknown architecture ($KERNEL)"
fi
# Architectual differences (AKA Silly Sun)
echo "Warning: Unknown architecture ($KERNEL)"
fi
# Architectual differences (AKA Silly Sun)
-if [ $ARCH = "sun" ]; then
+if [ $ARCH
ITECTURE
= "sun" ]; then
alias id=/usr/xpg4/bin/id
alias tr=/usr/xpg4/bin/tr
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...
# System dependencies
# Note: I don't like doing this but an alias doesn't work...
-if [ $ARCH = "sun" ]; then
+if [ $ARCH
ITECTURE
= "sun" ]; then
id=/usr/xpg4/bin/id
else
id=id
id=/usr/xpg4/bin/id
else
id=id
@@
-96,12
+96,10
@@
else
fi
# Source bash_completion (if present) (too slow for Windows)
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 $ARCH
ITECTURE
!= "cygwin" ]; then
source /etc/bash_completion
fi
source /etc/bash_completion
fi
-export CVSROOT=:ext:andrew@clearscm.com:/var/cvs/cvsroot
-
if [ -x ~/.rc/logout ]; then
trap "~/.rc/logout" 0
fi
if [ -x ~/.rc/logout ]; then
trap "~/.rc/logout" 0
fi
@@
-116,6
+114,11
@@
if [ -f ~/.rc/multisite ]; then
source ~/.rc/multisite
fi
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
# Import shell functions:
if [ -f ~/.rc/functions ]; then
source ~/.rc/functions
@@
-126,10
+129,15
@@
set -o emacs
set -o monitor
set +u
set -o monitor
set +u
+# Shell options
+shopt -s autocd
+shopt -s cdspell
+shopt -s dirspell
+shopt -s histappend
shopt -s lithist
# Aliases:
shopt -s lithist
# Aliases:
-if [ $ARCH = "FreeBSD" ]; then
+if [ $ARCH
ITECTURE
= "FreeBSD" ]; then
alias ls="ls -FG"
else
if [ -f ~/.rc/dircolors ]; then
alias ls="ls -FG"
else
if [ -f ~/.rc/dircolors ]; then
@@
-138,10
+146,10
@@
else
fi
fi
fi
fi
- if [ $ARCH = "sun" ]; then
+ if [ $ARCH
ITECTURE
= "sun" ]; then
# Ugh! --color doesn't work on braindead SUN
alias ls="ls -F"
# Ugh! --color doesn't work on braindead SUN
alias ls="ls -F"
- else
+ else
alias ls="ls -F --color=auto"
fi
fi
alias ls="ls -F --color=auto"
fi
fi
@@
-150,10
+158,18
@@
alias ll="ls -la"
alias whence="type -p"
alias mroe=more
alias whence="type -p"
alias mroe=more
-if [ $ARCH = "cygwin" ]; then
+if [ $ARCH
ITECTURE
= "cygwin" ]; then
alias host=nslookup
fi
alias host=nslookup
fi
+if [ -f "$SYSTEMDRIVE/Perl64/bin/perl" ]; then
+ alias asperl="$SYSTEMDRIVE/Perl64/bin/perl"
+fi
+
+if [ -f "$SYSTEMDRIVE/Perl/bin/perl" ]; then
+ alias asperl="$SYSTEMDRIVE/Perl64/bin/perl"
+fi
+
export LANG=C
if [ $(type -p vim) ]; then
export LANG=C
if [ $(type -p vim) ]; then
@@
-223,6
+239,11
@@
fi
# Color man pages with yellow keywords
export LESS_TERMCAP_md=$'\e[1;33m'
# 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
# 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