diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-04-16 10:42:42 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-04-16 10:42:42 -0400 |
| commit | 12662331d4597a40b58ca0f37deed76e312389ef (patch) | |
| tree | 7d8df92faa13daf4a26eb534215533b7d43d11a8 /.config/bash | |
| parent | c5fb55843c66f1ff6d4491009d9cf9781c0a3d7f (diff) | |
| parent | 7000ec189d6aecca3cbee5c68fe877f11cf0784e (diff) | |
Merge remote-tracking branch 'origin/master' into build64-par
Diffstat (limited to '.config/bash')
| -rw-r--r-- | .config/bash/logout.sh | 2 | ||||
| -rw-r--r-- | .config/bash/rc.sh | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/.config/bash/logout.sh b/.config/bash/logout.sh index a8b88c1..de4f5f7 100644 --- a/.config/bash/logout.sh +++ b/.config/bash/logout.sh @@ -5,5 +5,3 @@ if [ "$SHLVL" = 1 ]; then [ -x /usr/bin/clear_console ] && /usr/bin/clear_console -q fi - -make -C "$HOME" diff --git a/.config/bash/rc.sh b/.config/bash/rc.sh index 2bf60bc..ab690cf 100644 --- a/.config/bash/rc.sh +++ b/.config/bash/rc.sh @@ -13,7 +13,8 @@ shopt -s checkhash ################################################################################ # History settings -HISTCONTROL=ignoredups +# don't overwrite GNU Midnight Commander's setting of `ignorespace'. +HISTCONTROL=$HISTCONTROL${HISTCONTROL+,}ignoredups HISTFILE=${XDG_CACHE_HOME}/bash/history HISTTIMEFORMAT='[%Y-%m-%d %H:%M] ' HISTSIZE=5000 @@ -66,7 +67,7 @@ unset make_prompt ################################################################################ -# Load my alaises +# Load my aliases if [[ -f ${XDG_CONFIG_HOME}/bash/aliases.sh ]]; then . ${XDG_CONFIG_HOME}/bash/aliases.sh fi |