Added has() function; made EDITOR variables dependent on whether terminal is remote.

[dotfiles.git] / bash_login

diff --git a/bash_login b/bash_login
index 891551c1865d1160d4d14a18597a29b18eddb361..72a9ca9243f5546527b4c4c9b2aeb505a5454c01 100644 (file)
--- a/bash_login
+++ b/bash_login
@@ -15,9 +15,17 @@ export PS1='$( if [ $? = 0 ]; then echo \[\e[32m\]:-\)\ ; else echo \[\e[31m\]:-
 export PATH=~/bin:$PATH
 export MANPATH=~/man:$MANPATH
 
-source ~/etc/aliases
+source ~/.dotfiles/aliases
 
 export EDITOR=/usr/bin/vim
 export LSCOLORS=gxfxcxdxbxegedabagacad
 
 source ~/.dotfiles/webkit_login
+
+# Preserve bash history in multiple terminal windows
+# http://unix.stackexchange.com/questions/1288/preserve-bash-history-in-multiple-terminal-windows
+export HISTSIZE=10000
+export HISTFILESIZE=10000
+export HISTCONTROL=ignoredups:erasedups
+shopt -s histappend
+export PROMPT_COMMAND="history -a; history -c; history -r; $PROMPT_COMMAND"