X-Git-Url: https://defaria.com/gitweb/?a=blobdiff_plain;f=rc%2Fbash_login;h=306e82fc0ba1d2f57309fc8d7b592597de0462f9;hb=6a057f8fcf6e86496975b2e4d0e94609d277bd67;hp=000895336c625e6c86b300011aecb2126efdf2f8;hpb=14bd6c2ec7fb50112f0c3df8aa66ba568be97bd2;p=clearscm.git diff --git a/rc/bash_login b/rc/bash_login index 0008953..306e82f 100644 --- a/rc/bash_login +++ b/rc/bash_login @@ -11,6 +11,22 @@ # (c) Copyright 2000-2005, Andrew@DeFaria.com, all rights reserved. # ################################################################################ +# The following will set HOME, temporarily, to the directory of my $HOME so that +# somebody other than me can envoke my startup scripts. I use this mainly for +# when I become root with sudo -s and what a better environment that the bare +# bones root environment gives you. Note that for us to be effective one must +# source (or .) this file and if so the ${BASH_ARGV[0]} is the normal $0 +home=$(dirname ${BASH_ARGV[0]}) + +# Strip off .rc +home=${home/%\/\.rc/} + +# Now set $HOME if $home is different. +saved_home=$HOME +if [ "$HOME" != "$home" ]; then + HOME=$home +fi + # Set ARCHITECTURE of the machine KERNEL=$(uname -s) if [[ $KERNEL = CYGWIN* ]]; then @@ -100,8 +116,6 @@ 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 @@ -131,6 +145,11 @@ set -o emacs set -o monitor set +u +# Shell options +shopt -s autocd +shopt -s cdspell +shopt -s dirspell +shopt -s histappend shopt -s lithist # Aliases: @@ -146,7 +165,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 @@ -159,7 +178,19 @@ if [ $ARCHITECTURE = "cygwin" ]; then alias host=nslookup fi -export LANG=C +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 + +if [ $(locale -a | grep -c en_US.utf8) != 0 ]; then + export LANG=en_US.utf8 +else + export LANG=C +fi if [ $(type -p vim) ]; then alias vi=vim @@ -249,6 +280,9 @@ done # Set display to local export DISPLAY=${DISPLAY:-:0} +# Reset home in case it changed +HOME=$saved_home + # Now go home (in case we were not autmatically cd'ed there) if [ $(id -u) -ne 0 ]; then cd