Enhance guessing if UTF-8 or ISO8859-1 encoding should be used

[ConfigScripts.git] / sys / profile

diff --git a/sys/profile b/sys/profile
index 9d7e56366b5d89b18fcc4bb8f42c2a9879a4b630..a2def557ed0909148fe4bef5f2d1d5e3bdd02c17 100644 (file)
--- a/sys/profile
+++ b/sys/profile
@@ -14,8 +14,16 @@ export PROFILEREAD
 export UID
 
 # Indicates LC_CTYPE an UTF-8 terminal?
-[ -n "$LC_CTYPE" ] \
-       && LC_encoding="${LC_CTYPE#*.}" || LC_encoding="ISO8859-1"
+if [ -n "$LC_CTYPE" ]; then
+       LC_encoding="${LC_CTYPE#*.}"
+else
+       case "$TERM" in
+               "xterm-"*)
+                       LC_encoding="UTF-8"; ;;
+               *)
+                       LC_encoding="ISO8859-1"
+       esac
+fi
 # 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}"
@@ -40,7 +48,7 @@ else
 fi
 # prepend optional directories to PATH ...
 path=""
-for d in /Developer/usr/bin /usr/pkg/bin /usr/lib/ccache /opt/*/bin; do
+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:"
 done
 [ -n "$path" ] && PATH="$path$PATH"
@@ -77,9 +85,6 @@ fi
 [ -r /etc/debian_chroot ] && chroot_name=$(cat /etc/debian_chroot)
 [ -r /etc/chroot_name ] && chroot_name=$(cat /etc/chroot_name)
 
-# validate terminal definition
-[ -z "$TERM" ] && eval `tset -s -Q`
-
 # make sure $UID and $USER is set
 [ -z "$UID" ] && UID=`id -u`
 [ -z "$USER" ] && USER=`id -un`
@@ -116,7 +121,7 @@ fi
 
 # Setup some directories to use local storage (no NFS)
 [ -d "/usr/local/home/$USER" ] \
-       || mkdir -p "/usr/local/home/$USER" >/dev/null 2>&1
+       || ( mkdir /usr/local/home; mkdir "/usr/local/home/$USER" ) >/dev/null 2>&1
 if [ -w "/usr/local/home/$USER" ]; then
        export LOCAL_HOME="/usr/local/home/$USER"
        export CCACHE_DIR="$LOCAL_HOME/.ccache"
@@ -126,6 +131,9 @@ fi
 # interactive shell?
 [ "$PS1" ] || return
 
+# validate terminal definition
+eval `tset -s -Q`
+
 # generic shell prompt
 [ "$UID" -eq 0 ] \
        && PS1="<$ME> # " \