fix(system): improve ls coloring OS conditional

seantrane · May 15, 2023 · a34f7b7 · a34f7b7
1 parent 1004888
commit a34f7b7
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/system/aliases.zsh b/system/aliases.zsh
@@ -7,15 +7,16 @@
 alias reload="exec $SHELL -l"
 
 # Detect which `ls` flavor is in use
-if [[ "$OSTYPE" == "darwin"* ]]; then
-  colorflag="-G"
-  timeflag="-T"
-elif ls --color > /dev/null 2>&1; then # GNU `ls`
+# FreeBSD, older versions of OS X, have different ls command.
+if ls --color > /dev/null 2>&1; then
   colorflag="--color"
-  timeflag="--time-style=long-iso"
-else # OS X `ls`
+else
   colorflag="-G"
+fi
+if ls -T > /dev/null 2>&1; then
   timeflag="-T"
+else
+  timeflag="--time-style=long-iso"
 fi
 # shellcheck disable=SC2034
 colortimeflags="${colorflag} ${timeflag}"