From: Elan Ruusamäe <glen@pld-linux.org>
Date: Tue, 23 May 2006 13:38:58 +0000 (+0000)
Subject: - one subshell less; read i18n only if there's activity to be done
X-Git-Tag: AC-STABLE
X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=refs%2Ftags%2Fauto%2Fth%2Fkbd-1_15-3;hp=9a49e5a8d360dcbfa5e8da65960c7a13cbac98b5;p=packages%2Fconsole-tools.git

- one subshell less; read i18n only if there's activity to be done

Changed files:
    console.sh -> 1.14
---

diff --git a/console.sh b/console.sh
index 5a878fd..e018d5a 100644
--- a/console.sh
+++ b/console.sh
@@ -1,9 +1,8 @@
-[ -f /etc/sysconfig/i18n ] && . /etc/sysconfig/i18n
-
-tty -s
-if [ $? -eq 0 ]; then
+if tty -s; then
  case $TERM in
   linux)
+	[ -f /etc/sysconfig/i18n ] && . /etc/sysconfig/i18n
+
  	if [ -f /etc/sysconfig/console ]; then
 		. /etc/sysconfig/console