Merge branch 'master' into wsr_shared

This commit is contained in:
PostgreSQL administrator 2020-03-03 19:16:15 +01:00
commit 13c7528dae
3 changed files with 18 additions and 4 deletions

1
.vimrc
View File

@ -36,7 +36,6 @@ map <F7> :cp
map <F8> :cn map <F8> :cn
map!  >I<yypa/O map!  >I<yypa/O
autocmd FileType perl let perl_fold=1 autocmd FileType perl let perl_fold=1
autocmd FileType perl let perl_fold_blocks=1
autocmd FileType perl syntax on autocmd FileType perl syntax on
autocmd FileType go set sw=8 autocmd FileType go set sw=8

View File

@ -23,11 +23,26 @@ 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 ]]
then
for t in xterm-256color
do
for dir in /usr/share/terminfo/x /lib/terminfo/x/
do
if [[ -f $dir/$t ]]
then
TERM=$t
break 2
fi
done
done
fi
case "$TERM" in case "$TERM" in
xterm*|screen) xterm*|screen)
# indicated exit status by smiley (suggested by Stig Sandbeck Mathisen) # indicated exit status by smiley (suggested by Stig Sandbeck Mathisen)

View File

@ -54,13 +54,12 @@ then
PATH=`$preppath -c /usr/bin/X11:/usr/games:/usr/contrib/bin` PATH=`$preppath -c /usr/bin/X11:/usr/games:/usr/contrib/bin`
PATH=`$preppath -c /bin:/usr/bin` PATH=`$preppath -c /bin:/usr/bin`
# Debian's open/libre office is in /usr/bin, so we need to prepend
# the current version before it:
PATH=`$preppath -c /usr/sbin:/sbin` PATH=`$preppath -c /usr/sbin:/sbin`
PATH=`$preppath -c /usr/local/sbin:/usr/local/bin` PATH=`$preppath -c /usr/local/sbin:/usr/local/bin`
`$preppath -c -e /usr/local/node-v8.9.4-linux-x86/bin` `$preppath -c -e /usr/local/node-v8.9.4-linux-x86/bin`
`$preppath -c -e /usr/local/node-v8.9.4-linux-x64/bin` `$preppath -c -e /usr/local/node-v8.9.4-linux-x64/bin`
`$preppath -c -e -r /usr/lib/go-1.*/bin` `$preppath -c -e -r /usr/lib/go-1.*/bin`
`$preppath -c -e -r $HOME/go/bin`
PATH=`$preppath -c $HOME/scripts` PATH=`$preppath -c $HOME/scripts`
PATH=`$preppath -c $HOME/bin/hosts:$HOME/bin` PATH=`$preppath -c $HOME/bin/hosts:$HOME/bin`
@ -135,6 +134,7 @@ case "$LANG" in
esac esac
export NLS_DATE_FORMAT='YYYY-MM-DD HH24:MI:SS' export NLS_DATE_FORMAT='YYYY-MM-DD HH24:MI:SS'
export NLS_TIMESTAMP_FORMAT='YYYY-MM-DD HH24:MI:SS.FF'
if [ -x /usr/bin/less ] if [ -x /usr/bin/less ]