setup.sh: don't display hidden files on BSD's ls as root

diff --git a/setup.sh b/setup.sh
index 06c13e9d3f99e5fd83acb81a789ca876f0787d9c..c1922a2883aa49244413181b1a13b74374ebd8de 100755 (executable)
--- a/setup.sh
+++ b/setup.sh
@@ -86,14 +86,19 @@ fi
 if ls --color >/dev/null 2>&1; then
     ls_env=
     ls_color='--color'
+    ls_options=
 # Normal (BSD) ls with colors available.
 elif ls -G >/dev/null 2>&1; then
     ls_env='CLICOLOR_FORCE=1'
     ls_color='-G'
+    # Don't display hidden files by default when running as root. I use `la`
+    # for that.
+    ls_options='-I'
 # Simple ls with no colors.
 else
     ls_env=
     ls_color=
+    ls_options=
 fi
 
 # Also check if `column -t` is available.
@@ -104,8 +109,8 @@ else
 fi
 
 generate shell/aliases .in simple_cpp \
-    LS_ENV LS_COLOR COLUMN -- \
-    "$ls_env" "$ls_color" "$column"
+    LS_ENV LS_COLOR LS_OPTIONS COLUMN -- \
+    "$ls_env" "$ls_color" "$ls_options" "$column"
 
 # If `tig` is not available use my simple replacement.
 if ! installed tig; then

diff --git a/shell/aliases.in b/shell/aliases.in
index da44147923bb173e5f30f48fbd142c85f64da121..cd9bb63b85cce101ea0b5d031c1381a68842bb96 100644 (file)
--- a/shell/aliases.in
+++ b/shell/aliases.in
@@ -52,10 +52,10 @@ unalias ls 2>/dev/null
 # normal ls which needs CLICOLOR_FORCE so it displays colors when used with a
 # pager. If none work no colors are used.
 #
-# See `setup.sh` for details. LS_ENV and LS_COLOR are replaced with the
-# correct values when this file is generated.
+# See `setup.sh` for details. LS_* are replaced with the appropriate values
+# when this file is generated.
 ls() {
-    LS_ENV command ls LS_COLOR -C -F "$@" 2>&1 | less
+    LS_ENV command ls LS_COLOR LS_OPTIONS -C -F "$@" 2>&1 | less
 }
 
 unalias ll lt la lal lat 2>/dev/null