grml-screen: do not use & for redirecting output since it is running inside dash.

[grml-scripts-core.git] / usr_bin / grml-screen

diff --git a/usr_bin/grml-screen b/usr_bin/grml-screen
index 1288aa1..b455b62 100755 (executable)
--- a/usr_bin/grml-screen
+++ b/usr_bin/grml-screen
@@ -1,16 +1,11 @@
 #!/bin/dash
 # Filename:      grml-screen
-# Purpose:       wrapper for screen
+# Purpose:       wrapper for screen to start with appropriate configuration
 # 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: Sun Jan 08 15:30:06 CET 2006 [mika]
 ################################################################################
 
-# fix tty permissions
-#  sudo chmod 660      $TTY
-#  sudo chown root.tty $TTY
-
 # export variable USER for use withing GNU screen:
   export USER=`id -un`
 
@@ -19,14 +14,22 @@
   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_ >/dev/null 2>& 1 && chgrp utmp $SCREENDIR_
+fi
+mkdir -m 700 "${SCREENDIR_}/S-$USER" >/dev/null 2>&1
+
 # now run screen with config
   cd $HOME     # important for e.g. hardcopy-feature
+
   if [ `id -u` = 0 ] ; then
-    exec screen -c /etc/grml/screenrc
-  elif [ -r $HOME/.screenrc ] ; then
-    exec screen -c $HOME/.screenrc
+    exec screen -U -c /etc/grml/screenrc
+  elif [ -r "$HOME/.screenrc" ] ; then
+    exec screen -U -c "$HOME/.screenrc"
   else
-    exec screen -c /etc/grml/screenrc_grml
+    exec screen -U -c /etc/grml/screenrc_grml
   fi
 
 ## END OF FILE #################################################################