josh/files
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

use PROMPT_COMMAND to set terminal window title again

Browse Source 
when using "cd" hooks, the hooks were executed in subshell environments like (cd dir; ls) and leaving the window title incorrect when the subshell exited
This commit is contained in:
Josh Holtrop 2014-02-28 09:30:27 -05:00
parent 6011851fe4
commit 2a9c242373
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
bash_aliases
View File

@ -46,16 +46,12 @@ function prompt_ps1_svn_branch()
} }
########################################################################### ###########################################################################
# cd hooks # PROMPT_COMMAND
########################################################################### ###########################################################################
function cd() { command cd "$@"; cd_hook; }
function pushd() { command pushd "$@"; cd_hook; }
function popd() { command popd "$@"; cd_hook; }
case "$TERM" in case "$TERM" in
[ax]term*|rxvt*) [ax]term*|rxvt*)
function cd_hook_change_terminal_title() function prompt_command_change_terminal_title()
{ {
local dirname="" local dirname=""
if [[ "${PWD}" =~ .*/(.*) ]]; then if [[ "${PWD}" =~ .*/(.*) ]]; then
@ -65,12 +61,23 @@ case "$TERM" in
} }
;; ;;
*) *)
function cd_hook_change_terminal_title() function prompt_command_change_terminal_title()
{ {
: :
} }
;; ;;
esac esac
PROMPT_COMMAND="prompt_command_change_terminal_title"
###########################################################################
# cd hooks
###########################################################################
function cd() { command cd "$@"; cd_hook; }
function pushd() { command pushd "$@"; cd_hook; }
function popd() { command popd "$@"; cd_hook; }
function cd_hook_cat_todo() function cd_hook_cat_todo()
{ {
if [[ -r .todo ]]; then if [[ -r .todo ]]; then
@ -89,7 +96,6 @@ function cd_hook()
if [[ "${cd_hook_last_wd}" != "${PWD}" ]]; then if [[ "${cd_hook_last_wd}" != "${PWD}" ]]; then
cd_hook_cat_todo cd_hook_cat_todo
cd_hook_show_git_status cd_hook_show_git_status
cd_hook_change_terminal_title
cd_hook_last_wd="${PWD}" cd_hook_last_wd="${PWD}"
fi fi
} }
@ -192,7 +198,6 @@ export EDITOR=vim
HISTCONTROL='ignoreboth' HISTCONTROL='ignoreboth'
HISTSIZE=5000 HISTSIZE=5000
HISTFILESIZE=${HISTSIZE} HISTFILESIZE=${HISTSIZE}
unset PROMPT_COMMAND
########################################################################### ###########################################################################
# mark # mark