From b8516b5d111439815a0818b182de6b8913423a9b Mon Sep 17 00:00:00 2001
From: Nick Silva <nick.silva@thismoment.com>
Date: Mon, 31 Oct 2016 10:34:11 -0700
Subject: [PATCH] 818: Use ls instead of uname to set ls alias

---
 aliases/available/general.aliases.bash | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/aliases/available/general.aliases.bash b/aliases/available/general.aliases.bash
index 99939386..0ee11fa2 100644
--- a/aliases/available/general.aliases.bash
+++ b/aliases/available/general.aliases.bash
@@ -1,9 +1,15 @@
 cite about-alias
 about-alias 'general aliases'
 
+# Compact view, show colors
+if ls --color -d . >/dev/null 2>&1; then
+  alias ls='ls --color=auto'
+elif ls -G -d . >/dev/null 2>&1; then
+  alias ls='ls -G'
+fi
+
 # List directory contents
 alias sl=ls
-alias ls='ls -G'        # Compact view, show colors
 alias la='ls -AF'       # Compact view, show hidden
 alias ll='ls -al'
 alias l='ls -a'
@@ -11,10 +17,6 @@ alias l1='ls -1'
 
 alias _="sudo"
 
-if [ $(uname) = "Linux" ]
-then
-  alias ls="ls --color=auto"
-fi
 which gshuf &> /dev/null
 if [ $? -eq 0 ]
 then