Better detect encoding of the terminal

[ConfigScripts.git] / sys / profile

diff --git a/sys/profile b/sys/profile
index 6849ee5b2eb58cdc2daff1126633d27f6642639e..72ea7a6292f23ce7bdc85646d239fd6f94b23c1c 100644 (file)
--- a/sys/profile
+++ b/sys/profile
@@ -1,7 +1,7 @@
 #
 # /etc/profile: system-wide profile for the Bourne shell (sh(1)) and
 # Bourne compatible shells (bash(1), ksh(1), ash(1), ...).
-# Written 2003-2012 by Alexander Barton (alex@barton.de)
+# Written 2003-2014 by Alexander Barton (alex@barton.de)
 #
 
 [ -e ~/.ConfigScripts.debug ] && echo " >> /etc/profile ..."
@@ -13,10 +13,20 @@ export PROFILEREAD
 [ -n "$UID" ] || UID=`id -u`
 export UID
 
-# Indicates LC_CTYPE an UTF-8 terminal?
+# Setup locale and encoding
+if [ -e ~/.ConfigScripts.debug ]; then
+       echo " - TERM=\"$TERM\""
+       echo " - LANG=\"$LANG\""
+       echo " - LC_CTYPE=\"$LC_CTYPE\""
+fi
+# Does LC_CTYPE or LANG indicate an UTF-8 terminal?
+LC_encoding=""
 if [ -n "$LC_CTYPE" ]; then
        LC_encoding="${LC_CTYPE#*.}"
-else
+elif [ -n "$LANG" ]; then
+       LC_encoding="${LANG#*.}"
+fi
+if [ -z "$LC_encoding" ]; then
        case "$TERM" in
                "xterm-"*)
                        LC_encoding="UTF-8"; ;;
@@ -24,9 +34,11 @@ else
                        LC_encoding="ISO8859-1"
        esac
 fi
+[ -e ~/.ConfigScripts.debug ] && echo " - LC_encoding=\"$LC_encoding\" (temp)"
 # Set locale if it is not set or doesn't contain a dot:
 [ "$LANG" = "${LANG#*.}" -a "$LANG" != "C" ] \
        && export LANG="${LANG:-de_DE}.${LC_encoding}"
+[ -e ~/.ConfigScripts.debug ] && echo " - LANG=\"$LANG\" (new)"
 # All system messages should still be in "native" ("C") language for
 # non-X11 sessions:
 [ -z "$GDMSESSION" -a -z "$XDG_SESSION_COOKIE" ] \
@@ -49,24 +61,33 @@ fi
 # prepend optional directories to PATH ...
 path=""
 for d in /Developer/usr/bin /usr/pkg/bin /usr/ucb /usr/lib/ccache /opt/*/bin; do
-       [ -d "$d" -o -h "$d" ] && path="$path$d:"
+       if [ -d "$d" -o -h "$d" ]; then
+               [ -e "$d/.not_in_path" ] || path="$path$d:"
+       fi
 done
 [ -n "$path" ] && PATH="$path$PATH"
 if [ "$UID" -eq 0 ]; then
        path=""
        for d in /usr/pkg/sbin /opt/*/sbin; do
-               [ -d "$d" -o -h "$d" ] && path="$path$d:"
+               if [ -d "$d" -o -h "$d" ]; then
+                       [ -e "$d/.not_in_path" ] || path="$path$d:"
+               fi
        done
        [ -n "$path" ] && PATH="$path$PATH"
 fi
 # append optional directories to PATH ...
 for d in /usr/bin/X11 /usr/games /usr/share/php/bin; do
-       [ -d "$d" -o -h "$d" ] && PATH="$PATH:$d"
+       if [ -d "$d" -o -h "$d" ]; then
+               [ -e "$d/.not_in_path" ] || PATH="$PATH:$d"
+       fi
 done
 # set PATH so it includes user's private executables
-[ -d ~/Applications ] && PATH=~/Applications:"${PATH}"
-[ -d ~/bin ] && PATH=~/bin:"${PATH}"
-[ -d ~/sbin ] && PATH=~/sbin:"${PATH}"
+[ -d ~/Applications -a ! -e ~/Applications/.not_in_path ] \
+       && PATH=~/Applications:"${PATH}"
+[ -d ~/bin -a ! -e ~/bin/.not_in_path ] \
+       && PATH=~/bin:"${PATH}"
+[ -d ~/sbin -a ! -e ~/sbin/.not_in_path ] \
+       && PATH=~/sbin:"${PATH}"
 
 # Setup MANPATH, if manpath(1) isn't available
 if [ ! "$(type manpath 2>/dev/null)" ]; then