From 727a0966ff2ba2d2da7d5d7301298f42aad5d74c Mon Sep 17 00:00:00 2001 From: Torgny Bjers Date: Sat, 12 Apr 2014 01:05:00 -0400 Subject: [PATCH 1/2] Making sure not to break OS X --- plugins/common-aliases/common-aliases.plugin.zsh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/plugins/common-aliases/common-aliases.plugin.zsh b/plugins/common-aliases/common-aliases.plugin.zsh index b19650fee..c02413c8c 100644 --- a/plugins/common-aliases/common-aliases.plugin.zsh +++ b/plugins/common-aliases/common-aliases.plugin.zsh @@ -3,7 +3,9 @@ # # ls, the common ones I use a lot shortened for rapid fire usage -alias ls='ls --color' #I like color +if [[ `uname` != 'Darwin' ]]; then + alias ls='ls --color' #I like color +fi alias l='ls -lFh' #size,show type,human readable alias la='ls -lAFh' #long list,show almost all,show type,human readable alias lr='ls -tRFh' #sorted by date,recursive,show type,human readable From de77ede59c805b6be24dc499da40fe24aef7ded1 Mon Sep 17 00:00:00 2001 From: Torgny Bjers Date: Sat, 12 Apr 2014 09:41:48 -0400 Subject: [PATCH 2/2] Removing duplicated aliases --- plugins/common-aliases/common-aliases.plugin.zsh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/plugins/common-aliases/common-aliases.plugin.zsh b/plugins/common-aliases/common-aliases.plugin.zsh index c02413c8c..5feab8c53 100644 --- a/plugins/common-aliases/common-aliases.plugin.zsh +++ b/plugins/common-aliases/common-aliases.plugin.zsh @@ -3,14 +3,8 @@ # # ls, the common ones I use a lot shortened for rapid fire usage -if [[ `uname` != 'Darwin' ]]; then - alias ls='ls --color' #I like color -fi -alias l='ls -lFh' #size,show type,human readable -alias la='ls -lAFh' #long list,show almost all,show type,human readable alias lr='ls -tRFh' #sorted by date,recursive,show type,human readable alias lt='ls -ltFh' #long list,sorted by date,show type,human readable -alias ll='ls -l' #long list alias ldot='ls -ld .*' alias lS='ls -1FSsh' alias lart='ls -1Fcart'