From ecad0a8d62c499dec110308945674204e0faee15 Mon Sep 17 00:00:00 2001
From: Fernando Schauenburg <dev@schauenburg.me>
Date: Fri, 11 Dec 2020 12:18:07 +0100
Subject: [PATCH] refactor(bash): clean up alias definitions

---
 roles/bash/files/profile | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/roles/bash/files/profile b/roles/bash/files/profile
index ca934db..5303c3d 100644
--- a/roles/bash/files/profile
+++ b/roles/bash/files/profile
@@ -161,29 +161,27 @@ __ps1_set() {
 # Customize shell aliases
 ##############################################################################
 
-# Make `ls` group directories first if supported.
-if ls --group-directories-first &>/dev/null; then
-    alias ls="ls -hF --group-directories-first --color=auto"    # GNU
+# ls:  make `ls` group directories first if supported.
+# lsc: force `ls` to use color output (e.g. for piping into `less`).
+if ls --group-directories-first --color=auto &>/dev/null 2>&1; then
+    # GNU ls
+    alias ls="ls -hF --group-directories-first --color=auto"
+    alias lsc="ls --color=always"
 else
-    alias ls="ls -hF -G"                                        # BSD
-fi
-
-# Force `ls` to use color output (e.g. for piping into `less`).
-if ls --color=auto &>/dev/null; then
-    alias lsc="ls --color=always"                               # GNU
-else
-    alias lsc="/usr/bin/env CLICOLOR_FORCE=1 ls"                # BSD
+    # BSD ls (e.g. macOS)
+    alias ls="ls -hF -G"
+    alias lsc="/usr/bin/env CLICOLOR_FORCE=1 ls"
 fi
 
 alias la="ls -a"
 alias ll="ls -l"
-alias llc="lsc -l"
 alias lla="ls -la"
+alias llc="lsc -l"
 alias llac="lsc -la"
 
-alias grep="grep --color=auto";
-alias egrep="egrep --color=auto";
-alias fgrep="fgrep --color=auto";
+alias grep="grep --color=auto"
+alias egrep="egrep --color=auto"
+alias fgrep="fgrep --color=auto"
 alias path='echo $PATH | tr -s ":" "\n"'
 alias mpath='echo $MANPATH | tr -s ":" "\n"'
 alias timer='echo "Timer started. Stop with Ctrl-D." && date && time cat && date'