From c9fc813e195284de76e55f1b764f001270bf7fc3 Mon Sep 17 00:00:00 2001 From: Buddy Sandidge Date: Thu, 3 Jan 2019 20:43:16 -0800 Subject: [PATCH] Update aliases for OS X --- bash/aliases | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/bash/aliases b/bash/aliases index 8119351..45e4d8c 100644 --- a/bash/aliases +++ b/bash/aliases @@ -8,14 +8,17 @@ if [[ $(uname) == Darwin ]]; then music_dir='~/Music' desktop_dir='~/Desktop' docs_dir='~/Documents' + alias ls='ls -G' fi -alias ls='ls --color=auto' -alias dir='dir --color=auto' -alias vdir='vdir --color=auto' -alias grep='grep --color=auto' -alias fgrep='fgrep --color=auto' -alias egrep='egrep --color=auto' +if [[ $(uname) == Linux ]]; then + alias ls='ls --color=auto' + alias dir='dir --color=auto' + alias vdir='vdir --color=auto' + alias grep='grep --color=auto' + alias fgrep='fgrep --color=auto' + alias egrep='egrep --color=auto' +fi # Move around to common locations alias desktop="cd $desktop_dir" @@ -54,5 +57,6 @@ alias take='sudo chown `whoami`:`whoami` ' alias simple-http-server='python -m SimpleHTTPServer' alias numfiles='find . -maxdepth 1 -type f | wc -l' alias deepgrep='find . -type f -not -name "*.swp" -not -name "*.pyc" | sed "s/$/\"/g" | sed "s/^/\"/g" | xargs grep --color ' + # Show list of git branches alias git-br='for k in `git branch|perl -pe s/^..//`; do echo -e ` git show --pretty=format:"%Cgreen%ci %Cblue%cr%Creset" $k|head -n 1`\\t$k;done|sort -r'