From: Michael Prokop Date: Mon, 28 Feb 2011 11:19:51 +0000 (+0100) Subject: grml-screen/grml-init-screen: no longer use vt-is-UTF8 but instead default to UTF... X-Git-Tag: v1.4.2~1 X-Git-Url: http://git.grml.org/?p=grml-scripts-core.git;a=commitdiff_plain;h=68e8f6591df51e871e29e646c621b52c5b76949d grml-screen/grml-init-screen: no longer use vt-is-UTF8 but instead default to UTF-8. [Closes: issue959] Nowadays we're using UTF-8 anyway and because of the console-tools -> kbd transition the vt-is-UTF8 binary is no longer available let's get rid of this additional check. --- diff --git a/usr_bin/grml-init-screen b/usr_bin/grml-init-screen index 183df63..20587d8 100755 --- a/usr_bin/grml-init-screen +++ b/usr_bin/grml-init-screen @@ -17,7 +17,6 @@ # now start screen: cd $HOME # do we have a utf8 enabled terminal? - [ -x /usr/bin/vt-is-UTF8 ] && /usr/bin/vt-is-UTF8 -q && UTF='-U' - /usr/bin/screen $UTF -c /etc/grml/screenrc ; exec /bin/zsh + /usr/bin/screen -U -c /etc/grml/screenrc ; exec /bin/zsh ## END OF FILE ################################################################# diff --git a/usr_bin/grml-screen b/usr_bin/grml-screen index a33131a..ddc1a98 100755 --- a/usr_bin/grml-screen +++ b/usr_bin/grml-screen @@ -59,14 +59,13 @@ 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 #################################################################