mirror of
https://gitea.blesmrt.net/mikaela/shell-things.git
synced 2024-11-10 02:29:22 +01:00
{bash,zsh}rc: stop forcing colors, case-insentive grep + fix {f,e}grep
This commit is contained in:
parent
b8566e39f8
commit
e4a34dc4f2
18
rc/bashrc
18
rc/bashrc
@ -87,18 +87,18 @@ esac
|
|||||||
# enable color support of ls and also add handy aliases
|
# enable color support of ls and also add handy aliases
|
||||||
if [ -x /usr/bin/dircolors ]; then
|
if [ -x /usr/bin/dircolors ]; then
|
||||||
test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
|
test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
|
||||||
alias ls='ls --color=always'
|
alias ls='ls --color=auto'
|
||||||
alias dir='dir --color=always'
|
alias dir='dir --color=auto'
|
||||||
alias vdir='vdir --color=always'
|
alias vdir='vdir --color=auto'
|
||||||
|
|
||||||
alias grep='grep -i --color=always'
|
alias grep='grep --color=auto'
|
||||||
alias fgrep='fgrep -i --color=always'
|
alias fgrep='grep -F --color=auto'
|
||||||
alias egrep='egrep -i --color=always'
|
alias egrep='grep -E --color=auto'
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# some more ls aliases
|
# some more ls aliases
|
||||||
if [[ $UNAME != Darwin ]]; then
|
if [[ $UNAME != Darwin ]]; then
|
||||||
alias ll='ls -alFh --color=always' && alias la='ls -A --color=always' && alias l='ls -CF --color=always'
|
alias ll='ls -alFh --color=auto' && alias la='ls -A --color=auto' && alias l='ls -CF --color=auto'
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ $UNAME == Darwin ]]; then
|
if [[ $UNAME == Darwin ]]; then
|
||||||
@ -329,11 +329,11 @@ alias supybot-generate-messages.pot-mass="find . -type d -exec sh -c '(cd {} &&
|
|||||||
|
|
||||||
# enable color support of ls and also add handy aliases
|
# enable color support of ls and also add handy aliases
|
||||||
if [[ $UNAME != Darwin ]]; then
|
if [[ $UNAME != Darwin ]]; then
|
||||||
alias ls='ls --color=always'
|
alias ls='ls --color=auto'
|
||||||
fi
|
fi
|
||||||
# some more ls aliases
|
# some more ls aliases
|
||||||
if [[ $UNAME != Darwin ]]; then
|
if [[ $UNAME != Darwin ]]; then
|
||||||
alias ll='ls -alFh --color=always' && alias la='ls -A --color=always' && alias l='ls -CF --color=always'
|
alias ll='ls -alFh --color=auto' && alias la='ls -A --color=auto' && alias l='ls -CF --color=auto'
|
||||||
fi
|
fi
|
||||||
|
|
||||||
## -- End of aliases which are saved from Ubuntu default bashrc. --
|
## -- End of aliases which are saved from Ubuntu default bashrc. --
|
||||||
|
16
rc/zshrc
16
rc/zshrc
@ -299,16 +299,18 @@ alias theme="prompt "
|
|||||||
|
|
||||||
# enable color support of ls and also add handy aliases
|
# enable color support of ls and also add handy aliases
|
||||||
if [[ $UNAME != Darwin ]]; then
|
if [[ $UNAME != Darwin ]]; then
|
||||||
alias ls='ls --color=always'
|
alias ls='ls --color=auto'
|
||||||
fi
|
fi
|
||||||
alias dir='dir --color=always'
|
alias dir='dir --color=auto'
|
||||||
alias vdir='vdir --color=always'
|
alias vdir='vdir --color=auto'
|
||||||
alias grep='grep -i --color=always'
|
|
||||||
alias fgrep='fgrep -i --color=always'
|
alias grep='grep --color=auto'
|
||||||
alias egrep='egrep -i --color=always'
|
alias fgrep='fgrep -F --color=auto'
|
||||||
|
alias egrep='egrep -E --color=auto'
|
||||||
|
|
||||||
# some more ls aliases
|
# some more ls aliases
|
||||||
if [[ "$UNAME" != "Darwin" ]]; then
|
if [[ "$UNAME" != "Darwin" ]]; then
|
||||||
alias ll='ls -alFh --color=always' && alias la='ls -A --color=always' && alias l='ls -CF --color=always'
|
alias ll='ls -alFh --color=auto' && alias la='ls -A --color=auto' && alias l='ls -CF --color=auto'
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ $UNAME = Darwin ]]; then
|
if [[ $UNAME = Darwin ]]; then
|
||||||
|
Loading…
Reference in New Issue
Block a user