aboutsummaryrefslogtreecommitdiff
path: root/shellrc
diff options
context:
space:
mode:
authorKarel Kočí <cynerd@email.cz>2017-05-07 19:24:01 +0200
committerKarel Kočí <cynerd@email.cz>2017-05-07 19:24:01 +0200
commit0f99bd8974b91b7e2b3da96a13b1063ff696eea8 (patch)
tree696c638cc1b97fd5fb7c745cc4fb4060550e82ff /shellrc
parent937a02419eccc137205a9c23bacefae45231a32e (diff)
parentd9fbecd579fc4881b7abffd8aaab06666286dfcf (diff)
downloadmyconfigs-0f99bd8974b91b7e2b3da96a13b1063ff696eea8.tar.gz
myconfigs-0f99bd8974b91b7e2b3da96a13b1063ff696eea8.tar.bz2
myconfigs-0f99bd8974b91b7e2b3da96a13b1063ff696eea8.zip
Merge branch 'master' into server
Diffstat (limited to 'shellrc')
-rw-r--r--shellrc6
1 files changed, 5 insertions, 1 deletions
diff --git a/shellrc b/shellrc
index ce625aa..c357ef0 100644
--- a/shellrc
+++ b/shellrc
@@ -4,7 +4,11 @@
# Continue only if this is interactive shell
[[ $- != *i* ]] && return
-alias ls='ls --color=auto'
+if [ "$(uname -s)" = "FreeBSD" ]; then
+ alias ls='ls -G'
+else
+ alias ls='ls --color=auto'
+fi
alias ll='ls -l'
eval $(dircolors -b)
alias grep='grep --color=auto'