Fixed bug with aliasing less when not installed

[clearscm.git] / rc / bash_login

diff --git a/rc/bash_login b/rc/bash_login
index 64b6147..4cfce77 100644 (file)
--- a/rc/bash_login
+++ b/rc/bash_login
@@ -78,6 +78,7 @@ else
 fi
 
 export VISUAL=vi
+export EDITOR=vi
 
 # Terminal settings:
 if [ "$TERM" = ""        -o \
@@ -119,6 +120,8 @@ fi
 # Source bash_completion (if present) (too slow for Windows)
 if [ -r /etc/bash_completion -a $ARCHITECTURE != "cygwin" ]; then
   source /etc/bash_completion
+elif [ -r /usr/local/etc/bash_completion ]; then
+  source /usr/local/etc/bash_completion
 fi
 
 # Windows aliases
@@ -245,7 +248,7 @@ if [ "$TERM" = "hpterm"         -o \
 fi
 
 # Miscellaneous:
-if [ -x $(type -p less) ]; then
+if type -p less > /dev/null; then
    export LESS=eiXP"?f%f :[stdin] .?pt(%pt\%):?bt(%bt bytes):-.."
    alias more="less -sr"
    export PAGER="less -sr"
@@ -309,6 +312,9 @@ for script in $(\ls ~/.rc/client_scripts); do
   fi
 done
 
+# Set prompt as client customization may have changed things
+set_prompt
+
 # Set display to local
 
 export DISPLAY=${DISPLAY:-:0}