grml-init-screen + grml-screen: check for UTF capable terminal and use option -U...

diff --git a/debian/changelog b/debian/changelog
index 5fc9a7d..16e13bd 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+grml-scripts (0.9.17) unstable; urgency=low
+
+  * grml-init-screen + grml-screen: check for UTF capable
+    terminal and use option '-U' then
+
+ -- Michael Prokop <mika@grml.org>  Sat, 17 Feb 2007 12:16:54 +0100
+
 grml-scripts (0.9.16) unstable; urgency=low
 
   * grml-hostname: support non-interactive mode and do not

diff --git a/usr_bin/grml-init-screen b/usr_bin/grml-init-screen
index 2247760..8a08114 100755 (executable)
--- a/usr_bin/grml-init-screen
+++ b/usr_bin/grml-init-screen
@@ -4,7 +4,7 @@
 # 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: Sam Jun 25 12:11:22 CEST 2005 [mika]
+# Latest change: Sam Feb 17 12:14:46 CET 2007 [mika]
 ################################################################################
 
 # export variable USER for use withing GNU screen:
@@ -12,10 +12,13 @@
 
 # fix rungetty:
   TTY=`tty`
-  sudo chown $USER.$USER $TTY
+  sudo chmod 660       $TTY
+  sudo chown $USER.tty $TTY
 
 # now start screen:
   cd $HOME
-  /usr/bin/screen -c /etc/grml/screenrc ; exec /bin/zsh
+  # do we have a utf8 enabled terminal?
+  [ -x /usr/bin/vt-is-UTF8 ] && /usr/bin/vt-is-UTF8 && UTF='-U'
+  /usr/bin/screen $UTF -c /etc/grml/screenrc ; exec /bin/zsh
 
 ## END OF FILE #################################################################

diff --git a/usr_bin/grml-screen b/usr_bin/grml-screen
index 1288aa1..500e89b 100755 (executable)
--- a/usr_bin/grml-screen
+++ b/usr_bin/grml-screen
@@ -1,16 +1,12 @@
 #!/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]
+# Latest change: Sam Feb 17 12:15:05 CET 2007 [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`
 
@@ -21,12 +17,14 @@
 
 # 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 && UTF='-U'
   if [ `id -u` = 0 ] ; then
-    exec screen -c /etc/grml/screenrc
-  elif [ -r $HOME/.screenrc ] ; then
-    exec screen -c $HOME/.screenrc
+    exec screen $UTF -c /etc/grml/screenrc
+  elif [ -r "$HOME/.screenrc" ] ; then
+    exec screen $UTF -c "$HOME/.screenrc"
   else
-    exec screen -c /etc/grml/screenrc_grml
+    exec screen $UTF -c /etc/grml/screenrc_grml
   fi
 
 ## END OF FILE #################################################################