Mikaela/shell-things
1
0
Fork 0
mirror of https://gitea.blesmrt.net/mikaela/shell-things.git synced 2024-11-29 06:29:36 +01:00
Code Issues Projects Releases Wiki Activity

rc: merge/remove duplicate aliases

Browse Source 
grep was having two to three aliases and one of them disabled colours.
This commit is contained in:
Aminda Suomalainen 2015-04-22 22:55:12 +03:00
parent 3d54d51c24
commit 664924093c
2 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
rc/bashrc
View File

@ -92,9 +92,9 @@ if [ -x /usr/bin/dircolors ]; then
alias dir='dir --color=always'
alias vdir='vdir --color=always'
alias grep='grep --color=always'
alias fgrep='fgrep --color=always'
alias egrep='egrep --color=always'
alias grep='grep -i --color=always'
alias fgrep='fgrep -i --color=always'
alias egrep='egrep -i --color=always'
fi
# some more ls aliases
@ -322,11 +322,6 @@ alias supybot-generate-messages.pot-mass="find . -type d -exec sh -c '(cd {} &&
if [[ $UNAME != Darwin ]]; then
alias ls='ls --color=always'
fi
alias dir='dir --color=always'
alias vdir='vdir --color=always'
alias grep='grep --color=always'
alias fgrep='fgrep --color=always'
alias egrep='egrep --color=always'
# some more ls aliases
if [[ $UNAME != Darwin ]]; then
alias ll='ls -alFh --color=always' && alias la='ls -A --color=always' && alias l='ls -CF --color=always'
@ -390,9 +385,6 @@ alias myip="myip4 && myip6"
# Update groups without logging out. Requires entering password. Source: http://blog.edwards-research.com/2010/10/linux-refresh-group-membership-without-logging-out/
alias refreshgroups="exec su -l $USER"
# Incasesensitive grepping
alias grep="grep -i"
# Get public key lenght of (public) SSH key
alias ssh-pubkey-length="ssh-keygen -lf "

9
rc/zshrc
View File

@ -283,9 +283,9 @@ if [[ $UNAME != Darwin ]]; then
fi
alias dir='dir --color=always'
alias vdir='vdir --color=always'
alias grep='grep --color=always'
alias fgrep='fgrep --color=always'
alias egrep='egrep --color=always'
alias grep='grep -i --color=always'
alias fgrep='fgrep -i --color=always'
alias egrep='egrep -i --color=always'
# some more ls aliases
if [[ "$UNAME" != "Darwin" ]]; then
alias ll='ls -alFh --color=always' && alias la='ls -A --color=always' && alias l='ls -CF --color=always'
@ -369,9 +369,6 @@ alias myip="myip4 && myip6"
# Update groups without logging out. Requires entering password. Source: http://blog.edwards-research.com/2010/10/linux-refresh-group-membership-without-logging-out/
alias refreshgroups="exec su -l $USER"
# Incasesensitive grepping
alias grep="grep -i"
# Get public key lenght of (public) SSH key
alias ssh-pubkey-length="ssh-keygen -lf "