X-Git-Url: https://ruderich.org/simon/gitweb/?p=config%2Fdotfiles.git;a=blobdiff_plain;f=setup.sh;h=c1922a2883aa49244413181b1a13b74374ebd8de;hp=06c13e9d3f99e5fd83acb81a789ca876f0787d9c;hb=9df13622741df2a99bd4067157486098638610b8;hpb=ae9b1f3d4fe45783c93439647753c1273e0a44b2 diff --git a/setup.sh b/setup.sh index 06c13e9..c1922a2 100755 --- 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