X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=shell%2Fenv;h=595115370245783eb67c48ae970aff3e880bcbf8;hb=0d1c3c96beca1d3667df0fc7985423fab82d8086;hp=a7f7405049710bec78eae1bc0e25a7bc3a7743e2;hpb=0f76f93bd286c46d281a574a6db67e038b6d42a7;p=config%2Fdotfiles.git

diff --git a/shell/env b/shell/env
index a7f7405..5951153 100644
--- a/shell/env
+++ b/shell/env
@@ -1,9 +1,23 @@
 # Configuration file for environment related options for all shells.
 
 
+# Helper function to print debug information if $DEBUG is not empty.
+#
+# Doesn't fit perfectly in this file, but this is the best place to make it
+# available everywhere.
+function source_debug() {
+    if [ x$DEBUG != x ]; then
+        echo $@
+    fi
+}
+
+
+source_debug "sourcing ~/.shell/env"
+
 # Use UTF-8 encoding in the terminal.
 LC_ALL=en_US.UTF-8
-export LC_ALL
+LANG=$LC_ALL
+export LC_ALL LANG
 
 # Use Vim as editor.
 EDITOR=vim
@@ -13,13 +27,33 @@ export EDITOR
 PAGER=less
 export PAGER
 
-# Set colors for ls (and zsh completions). This colors files normal (fi),
+# Set colors for GNU ls (and zsh completions). This colors files normal (fi),
 # directories blue bold (di), symbolic links cyan (ln), named pipes normal
 # (pi), sockets normal (so), block devices normal (bd), character devices
-# normal (cd) and executables bold red (ex).
+# normal (cd), orphaned links with red background (or), setuid (su) and setgid
+# (sg) files with yellow background, directories writable by others with blue
+# background (ow) and executables bold red (ex).
 # See `dircolors --print-database` for possible colors.
-LS_COLORS='no=00:fi=00:di=34;01:ln=36:pi=00:so=00:bd=00:cd=00:ex=31;01'
+LS_COLORS="no=00:fi=00:di=34;01:ln=36:pi=00:so=00:bd=00:cd=00:\
+or=36;41:su=31;01;43:sg=31;01;43:ow=34;01;41:ex=31;01"
 export LS_COLORS
+# Set the same colors for non GNU ls, except for orphaned links which aren't
+# supported.
+LSCOLORS='ExgxxxxxBxxxxxBdBdExEb'
+#         ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^
+#         | | | | | | | | | | |
+#         | | | | | | | | | | *- directory writable to others, without sticky bit
+#         | | | | | | | | | *--- directory writable to others, with sticky bit
+#         | | | | | | | | *----- executable with setgid bit set
+#         | | | | | | | *------- executable with setuid bit set
+#         | | | | | | *--------- character special
+#         | | | | | *----------- block special
+#         | | | | *------------- executable
+#         | | | *--------------- pipe
+#         | | *----------------- socket
+#         | *------------------- symbolic link
+#         *--------------------- directory
+export LSCOLORS
 
 
 # Sources a configuration file if it exists; loads a fallback .local file if
@@ -59,30 +93,30 @@ export LS_COLORS
 #
 # Doesn't fit perfectly in this file, but this is the best place to make it
 # available everywhere.
+#
+# If DEBUG is set to a non empty value additional debug output is printed.
 function source_config() {
     # Path to the file to source and its local counterpart.
     local source_file=$1/$2/$3.$4
     local source_file_local=$1/$3.local
 
     # Additional debug output.
-    if [ x$DEBUG != x ]; then
-        echo "source_config(): checking if $source_file exists"
-        echo "source_config(): checking if $source_file_local exists"
-    fi
+    source_debug "source_config(): checking if $source_file exists"
+    source_debug "source_config(): checking if $source_file_local exists"
 
     # If the file does exist then source it.
     if [ -f $source_file ]; then
-        if [ x$DEBUG != x ]; then
-            echo "source_config(): sourcing $source_file"
-        fi
+        source_debug "source_config(): -> sourcing $source_file"
         source $source_file
 
     # Otherwise load the .local file if it exists and .local files are
     # allowed.
     elif [ -f $source_file_local -a x$5 != xnolocal ]; then
-        if [ x$DEBUG != x ]; then
-            echo "source_config(): sourcing $source_file_local"
-        fi
+        source_debug "source_config(): -> sourcing $source_file_local"
         source $source_file_local
+    else
+        source_debug "source_config(): -> neither exists"
     fi
 }
+
+source_debug "finished sourcing ~/.shell/env"