rely on termcompat script instead of declaring tcmp in shellrc
This commit is contained in:
parent
f6d19db338
commit
ce84d3aa68
2 changed files with 16 additions and 20 deletions
20
bashrc
20
bashrc
|
@ -42,7 +42,6 @@ alias rgrep='command grep --exclude-dir=\.git -R'
|
|||
alias ggrep='command git grep'
|
||||
alias tailf='command less -R +F'
|
||||
alias diff='command diff --color'
|
||||
alias s='tcmp ssh'
|
||||
|
||||
# ls
|
||||
alias ls='command ls --color=auto --group-directories-first '
|
||||
|
@ -84,20 +83,19 @@ gdiff() { /usr/bin/git diff --color "$@"; }
|
|||
gdf()
|
||||
{
|
||||
local difftool
|
||||
if difftool=$(whence sdiff-so-fancy); then
|
||||
gdiff "$@" | $difftool | less --tabs=4 -RSFX
|
||||
if difftool=$(command -v sdiff-so-fancy); then
|
||||
gdiff "$@" | "$difftool" | less --tabs=4 -RSFX
|
||||
else
|
||||
gdiff "$@"
|
||||
fi
|
||||
}
|
||||
# term compatibility for remote stuff
|
||||
tcmp() {
|
||||
local -A terms=(
|
||||
[rxvt-unicode-256color]='rxvt-unicode'
|
||||
[st-256color]='xterm-256color'
|
||||
[tmux-256color]='screen.xterm-new'
|
||||
)
|
||||
TERM="${terms[$TERM]:-$TERM}" "$@"
|
||||
# more compatible TERM for ssh sessions
|
||||
s() {
|
||||
if termcompat=$(command -v termcompat); then
|
||||
"$termcompat" ssh "$@"
|
||||
else
|
||||
ssh "$@"
|
||||
fi
|
||||
}
|
||||
|
||||
# we want to see exit code on error (it also has to be the last entry here)
|
||||
|
|
16
zshrc
16
zshrc
|
@ -148,7 +148,6 @@ alias rgrep='command grep --exclude-dir=\.git -R'
|
|||
alias ggrep='command git grep'
|
||||
alias tailf='command less -R +F'
|
||||
alias diff='command diff --color'
|
||||
alias s='tcmp ssh'
|
||||
|
||||
# ls
|
||||
alias ls='command ls --color=auto --group-directories-first '
|
||||
|
@ -199,13 +198,12 @@ greset() {
|
|||
/usr/bin/git clean -fd
|
||||
/usr/bin/git reset --hard
|
||||
}
|
||||
# term compatibility for remote stuff
|
||||
tcmp() {
|
||||
local -A terms=(
|
||||
'rxvt-unicode-256color' 'rxvt-unicode'
|
||||
'st-256color' 'xterm-256color'
|
||||
'tmux-256color' 'screen.xterm-new'
|
||||
)
|
||||
TERM=${terms[$TERM]:-$TERM} "$@"
|
||||
# more compatible TERM for ssh sessions
|
||||
s() {
|
||||
if termcompat=$(whence termcompat); then
|
||||
$termcompat ssh "$@"
|
||||
else
|
||||
ssh "$@"
|
||||
fi
|
||||
}
|
||||
# }}}
|
||||
|
|
Loading…
Reference in a new issue