X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=usr_bin%2Fgrml-screen;h=d6413e0c51fadbd84d02b503ec241c743b9821ae;hb=76adfcd2eee56a59c353dcb2e4f7ee5a02af062b;hp=cd405032ae3c69656ad853c3cb2fb8b46d1d510d;hpb=d6b26ce3b8ffa721052bfb0eebc546ac9a63e5f9;p=grml-scripts-core.git

diff --git a/usr_bin/grml-screen b/usr_bin/grml-screen
index cd40503..d6413e0 100755
--- a/usr_bin/grml-screen
+++ b/usr_bin/grml-screen
@@ -4,7 +4,6 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Mit Mär 21 15:39:00 CET 2007 [mika]
 ################################################################################
 
 # export variable USER for use withing GNU screen:
@@ -15,16 +14,23 @@
   sudo chmod 660       $TTY
   sudo chown $USER.tty $TTY
 
+# try to mitigate raceconditions from screen
+SCREENDIR_="/var/run/screen"
+if [ `id -u` = 0 ] ; then
+    mkdir -m 755 $SCREENDIR_
+    chgrp utmp $SCREENDIR_
+fi
+mkdir -m 700 "${SCREENDIR_}/S-$USER" &>/dev/null
+
 # now run screen with config
   cd $HOME     # important for e.g. hardcopy-feature
-  # do we have a utf8 enabled terminal?
-  [ -x /usr/bin/vt-is-UTF8 ] && /usr/bin/vt-is-UTF8 -q && UTF='-U'
+
   if [ `id -u` = 0 ] ; then
-    exec screen $UTF -c /etc/grml/screenrc
+    exec screen -U -c /etc/grml/screenrc
   elif [ -r "$HOME/.screenrc" ] ; then
-    exec screen $UTF -c "$HOME/.screenrc"
+    exec screen -U -c "$HOME/.screenrc"
   else
-    exec screen $UTF -c /etc/grml/screenrc_grml
+    exec screen -U -c /etc/grml/screenrc_grml
   fi
 
 ## END OF FILE #################################################################