[debian-edu-commits] debian-edu/pkg-team/ 40/159: better Debian integrated start script

[Dominik George]

This is an automated email from the git hooks/post-receive script.

natureshadow-guest pushed a commit to branch master
in repository xrdp.

commit 668a09f45742e24694940f929ea9f80435e0cf4f
Author: mirabilos <tg at mirbsd.org>
Date:   Wed Aug 5 22:15:40 2015 +0200

    better Debian integrated start script
---
 startwm.sh | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/startwm.sh b/startwm.sh
index 4c727a5..2be625f 100644
--- a/startwm.sh
+++ b/startwm.sh
@@ -1,8 +1,24 @@
 #!/bin/sh
+# xrdp X session start script (c) 2015 mirabilos
 
 if test -r /etc/default/locale; then
 	. /etc/default/locale
-	export LANG LANGUAGE
+	test -z "${LANG+x}" || export LANG
+	test -z "${LANGUAGE+x}" || export LANGUAGE
+	test -z "${LC_ADDRESS+x}" || export LC_ADDRESS
+	test -z "${LC_ALL+x}" || export LC_ALL
+	test -z "${LC_COLLATE+x}" || export LC_COLLATE
+	test -z "${LC_CTYPE+x}" || export LC_CTYPE
+	test -z "${LC_IDENTIFICATION+x}" || export LC_IDENTIFICATION
+	test -z "${LC_MEASUREMENT+x}" || export LC_MEASUREMENT
+	test -z "${LC_MESSAGES+x}" || export LC_MESSAGES
+	test -z "${LC_MONETARY+x}" || export LC_MONETARY
+	test -z "${LC_NAME+x}" || export LC_NAME
+	test -z "${LC_NUMERIC+x}" || export LC_NUMERIC
+	test -z "${LC_PAPER+x}" || export LC_PAPER
+	test -z "${LC_TELEPHONE+x}" || export LC_TELEPHONE
+	test -z "${LC_TIME+x}" || export LC_TIME
+	test -z "${LOCPATH+x}" || export LOCPATH
 fi
 
-. /etc/X11/Xsession
+exec /etc/X11/Xsession

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/xrdp.git