linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2025-12-26 02:12:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Escape prompt expansion arguments in precmd before setting title.

Browse source 
The arguments passed to precmd that are used to set the title ($2 and
$CMD) were not properly being escaped for prompt expansion. Fixes
issue #342.
This commit is contained in:
Russell Harmon 2011-08-24 16:02:08 -04:00
commit 9634d69394
1 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
lib/termsupport.zsh
View file

@ -4,11 +4,16 @@
#Limited support for Apple Terminal (Terminal can't set window or tab separately) #Limited support for Apple Terminal (Terminal can't set window or tab separately)
function title { function title {
[ "$DISABLE_AUTO_TITLE" != "true" ] || return [ "$DISABLE_AUTO_TITLE" != "true" ] || return
local e1="$1" e2="$2"
if [[ "$TITLE_NO_ESCAPE" != 1 ]]; then
e1="$1:q"
e2="$1:q"
fi
if [[ "$TERM" == screen* ]]; then if [[ "$TERM" == screen* ]]; then
print -Pn "\ek$1:q\e\\" #set screen hardstatus, usually truncated at 20 chars print -Pn "\ek$e1\e\\" #set screen hardstatus, usually truncated at 20 chars
elif [[ "$TERM" == xterm* ]] || [[ $TERM == rxvt* ]] || [[ "$TERM_PROGRAM" == "iTerm.app" ]]; then elif [[ "$TERM" == xterm* ]] || [[ $TERM == rxvt* ]] || [[ "$TERM_PROGRAM" == "iTerm.app" ]]; then
print -Pn "\e]2;$2:q\a" #set window name print -Pn "\e]2;$e2\a" #set window name
print -Pn "\e]1;$1:q\a" #set icon (=tab) name (will override window name on broken terminal) print -Pn "\e]1;$e1\a" #set icon (=tab) name (will override window name on broken terminal)
fi fi
} }
@ -25,5 +30,8 @@ function preexec {
emulate -L zsh emulate -L zsh
setopt extended_glob setopt extended_glob
local CMD=${1[(wr)^(*=*|sudo|ssh|-*)]} #cmd name only, or if this is sudo or ssh, the next cmd local CMD=${1[(wr)^(*=*|sudo|ssh|-*)]} #cmd name only, or if this is sudo or ssh, the next cmd
title "$CMD" "%100>...>$2%<<" local psvar
psvar[1]="$CMD"
psvar[2]="$2"
TITLE_NO_ESCAPE=1 title "%1v" "%100>...>%2v%<<"
} }