X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=usr_bin%2Fgrml-screen;h=ddc1a98ab2eecc5e9cdfba48449b5c15ee4e4db8;hb=68e8f6591df51e871e29e646c621b52c5b76949d;hp=7deeb770928482505deac1f49668848a3caba42e;hpb=f9835a0551733e1540cf826f2a520ee96c342718;p=grml-scripts-core.git

diff --git a/usr_bin/grml-screen b/usr_bin/grml-screen
index 7deeb77..ddc1a98 100755
--- a/usr_bin/grml-screen
+++ b/usr_bin/grml-screen
@@ -15,50 +15,57 @@
   sudo chown $USER.tty $TTY
 
 # FIXME: fix for screen race-conditions
-PID_FILE_="/var/run/grml-screen"
+PID_FILE_="/var/lock/grml-screen"
+PID_FILE_CREATED_="false"
 MY_PID_="$$"
 if [ ! -d "/var/run/screen/S-$USER" ]; then
     # no /var/run/screen/S-$USER and possible no /var/run/screen either -> locking
     for i in `seq 40`; do   # 40*0.25 = 10 seconds
         if lockfile-create --retry 0 $PID_FILE_; then
             echo $MY_PID_ >$PID_FILE_
+            PID_FILE_CREATED_="true"
             break
+        else
+            PID_FILE_CREATED_="error"
         fi
         sleep 0.25
     done
 fi
-if [ -f $PID_FILE_ ]; then
+if [ $PID_FILE_CREATED_ = "true" ]; then
     # FORK BEGIN
     (
-    for i in `seq 40`; do   # 40*0.25 = 10 seconds
-        if [ ! -d "/var/run/screen/S-$USER" ]; then
-            sleep 0.25  # educated guess
-        else
-            break
+        for i in `seq 40`; do   # 40*0.25 = 10 seconds
+            if [ ! -d "/var/run/screen/S-$USER" ]; then
+                sleep 0.25  # educated guess
+            else
+                break
+            fi
+        done
+        if [ `cat $PID_FILE_` = $MY_PID_ ]; then
+            rm $PID_FILE_
+            lockfile-remove $PID_FILE_
         fi
-    done
-    if [ `cat $PID_FILE_` = $MY_PID_ ]; then
-        rm $PID_FILE_
-        lockfile-remove $PID_FILE_
-    fi
     )&
     # FORK END
-else
+elif [ $PID_FILE_CREATED_ = "error" ]; then
     SLEEP_TIME_="$(( $$ % 5 * 5 + 5 ))"
-    echo "grml-screen: Error could not create lockfile! (sleeping for $SLEEP_TIME_)"
+    echo "grml-screen: Error could not create lockfile! (sleeping for $SLEEP_TIME_)" >&2
     sleep $SLEEP_TIME_
+elif [ $PID_FILE_CREATED_ = "false" ]; then
+    echo "nothing to do" &>/dev/null
+else
+    echo "grml-screen: internal error - PID_FILE_CREATED_ == \"$PID_FILE_CREATED_\"" >&2
 fi
 
 # 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 #################################################################