X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=sys%2Fprofile;h=3369081c69fdd44d09c1dd8fa45bb36affcc3fa8;hb=39f5717c95e7282f880fe75fd37662df9b3ba87b;hp=67b6314e59994002ab8c197d18b1bee835c9196c;hpb=659ed6dc3316ccd136f966d84bb7a7def6901bc2;p=ConfigScripts.git

diff --git a/sys/profile b/sys/profile
index 67b6314..3369081 100644
--- 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,13 +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}"
-# All system messages should still be in "native" ("C") language for
-# non-X11 sessions:
-[ -z "$GDMSESSION" -a -z "$XDG_SESSION_COOKIE" ] \
-	&& export LC_MESSAGES="C"
+[ -e ~/.ConfigScripts.debug ] && echo " - LANG=\"$LANG\" (new)"
 # Clean up ...
 unset LC_CTYPE LC_encoding 2>/dev/null