X-Git-Url: https://defaria.com/gitweb/?a=blobdiff_plain;f=rc%2Fbash_login;h=53bccb973aaec91d07997537ca2d47cdb2cb0366;hb=56ed74d620f8fbba5430642cf4ddbcb8b818b9a3;hp=79d1c603b8a8ee13f52d5f62cf1a9de228c30a8f;hpb=92e77d1f1d45dd80d8b1360aad69e9d800ad8ca0;p=clearscm.git

diff --git a/rc/bash_login b/rc/bash_login
index 79d1c60..53bccb9 100644
--- a/rc/bash_login
+++ b/rc/bash_login
@@ -11,6 +11,26 @@
 # (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
+if [ -n "${BASH_ARGV[0]}" ]; then
+  home=$(dirname ${BASH_ARGV[0]})
+else
+  home=$HOME
+fi
+
+# 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
@@ -130,9 +150,12 @@ set -o monitor
 set +u
 
 # Shell options
-shopt -s autocd
+if ! grep -qP '5\.(6|7|8|9|10)' /etc/*release; then
+  shopt -s autocd
+  shopt -s dirspell
+fi
+
 shopt -s cdspell
-shopt -s dirspell
 shopt -s histappend
 shopt -s lithist
 
@@ -169,8 +192,12 @@ fi
 if [ -f "$SYSTEMDRIVE/Perl/bin/perl" ]; then
   alias asperl="$SYSTEMDRIVE/Perl64/bin/perl"
 fi
-  
-export LANG=C
+
+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
@@ -244,6 +271,11 @@ if [ -d /opt/clearscm/lib ]; then
   export PERL5LIB="$PERL5LIB:/opt/clearscm/lib"
 fi
 
+# Lessfile
+if type lessfile > /dev/null 2>&1; then
+  eval $(lessfile)
+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
@@ -260,6 +292,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