diff options
author | Karel Kočí <cynerd@email.cz> | 2017-05-07 19:24:01 +0200 |
---|---|---|
committer | Karel Kočí <cynerd@email.cz> | 2017-05-07 19:24:01 +0200 |
commit | 0f99bd8974b91b7e2b3da96a13b1063ff696eea8 (patch) | |
tree | 696c638cc1b97fd5fb7c745cc4fb4060550e82ff | |
parent | 937a02419eccc137205a9c23bacefae45231a32e (diff) | |
parent | d9fbecd579fc4881b7abffd8aaab06666286dfcf (diff) | |
download | myconfigs-0f99bd8974b91b7e2b3da96a13b1063ff696eea8.tar.gz myconfigs-0f99bd8974b91b7e2b3da96a13b1063ff696eea8.tar.bz2 myconfigs-0f99bd8974b91b7e2b3da96a13b1063ff696eea8.zip |
Merge branch 'master' into server
-rw-r--r-- | shellrc | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -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' |