Remove xterm+256color again but check /lib/terminfo
The terminal defintions with a + are just building blocks, not full definitions. We can't use them. OTOH, the definitions in /lib/terminfo seem to work fine in current Debian and Ubuntu versions (which is what I care about these days), so we accept them.
This commit is contained in:
parent
be8eb03364
commit
4717013939
19
.znewterm
19
.znewterm
|
@ -23,20 +23,23 @@ then
|
||||||
stty erase
|
stty erase
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ $TERM == xterm-256color && ! -f /usr/share/terminfo/x/xterm-256color ]]
|
if [[ $TERM == xterm-256color && ! -f /usr/share/terminfo/x/xterm-256color && ! -f /lib/terminfo/x/xterm-256color ]]
|
||||||
then
|
then
|
||||||
TERM=xterm
|
TERM=xterm
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ $TERM == xterm ]]
|
if [[ $TERM == xterm ]]
|
||||||
then
|
then
|
||||||
for t in xterm-256color xterm+256color
|
for t in xterm-256color
|
||||||
do
|
do
|
||||||
if [[ -f /usr/share/terminfo/x/$t ]]
|
for dir in /usr/share/terminfo/x /lib/terminfo/x/
|
||||||
then
|
do
|
||||||
TERM=$t
|
if [[ -f $dir/$t ]]
|
||||||
break
|
then
|
||||||
fi
|
TERM=$t
|
||||||
|
break 2
|
||||||
|
fi
|
||||||
|
done
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -57,7 +60,7 @@ case "$TERM" in
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
if [[ $TERM = xterm || $TERM = xterm-256color || $TERM = xterm+256color ]]
|
if [[ $TERM = xterm || $TERM = xterm-256color ]]
|
||||||
then
|
then
|
||||||
if [ -f ~/.zxtermcolors ]
|
if [ -f ~/.zxtermcolors ]
|
||||||
then
|
then
|
||||||
|
|
Loading…
Reference in New Issue