Merge branch 'main' into man-pages

DiamondLightSource · Dec 22, 2024 · f541b8a · f541b8a
2 parents 012b0ef + d6ecb94
commit f541b8a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/.devcontainer/features/bash-config/config/bash-config-rc b/.devcontainer/features/bash-config/config/bash-config-rc
@@ -38,6 +38,12 @@ __bash_prompt() {
 __bash_prompt
 export PROMPT_DIRTRIM=4
 
+# colorize ls output
+export LS_OPTIONS='--color=auto'
+eval "$(dircolors)"
+alias ls='ls $LS_OPTIONS'
+alias ll='ls $LS_OPTIONS -l'
+
 # enable bash completion for git
 if [[ -f /usr/share/bash-completion/completions/git ]]; then
   source /usr/share/bash-completion/completions/git

diff --git a/test/bash-config/test.sh b/test/bash-config/test.sh
@@ -12,6 +12,7 @@ source dev-container-features-test-lib
 # check <LABEL> <cmd> [args...]
 check "execute command" bash -c "test $HISTFILE == $CONFIG_FOLDER/.bash_eternal_history"
 check "man installed" man -V
+check "ls colors" bash -c "test $LS_OPTIONS == --color=auto"
 
 # Report results
 # If any of the checks above exited with a non-zero exit code, the test will fail.