From e4867d92bb81899d926915e07ee2f18955b61955 Mon Sep 17 00:00:00 2001
From: mhiretskiy <mhiretskiy@c91db197-33c1-4113-bf15-f8a5c547ca64>
Date: Fri, 29 May 2009 07:10:59 +0000
Subject: [PATCH] =?UTF-8?q?=D0=92=20login=20=D0=BF=D0=BE=D0=BC=D0=B5=D1=89?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=BA=D0=BE=D0=BD=D1=81=D1=82=D1=80=D1=83?=
 =?UTF-8?q?=D0=BA=D1=86=D0=B8=D1=8F=20=D0=B4=D0=BB=D1=8F=20=D1=82=D1=80?=
 =?UTF-8?q?=D0=B0=D0=BD=D1=81=D0=BB=D1=8F=D1=86=D0=B8=D0=B8=20utf-8=20?=
 =?UTF-8?q?=D0=B2=20koi8-r,=20=D0=B4=D0=BB=D1=8F=20xmessage?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://svn.calculate.ru/calculate2/calculate-client/trunk@1547 c91db197-33c1-4113-bf15-f8a5c547ca64
---
 data/login | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/data/login b/data/login
index 8e03584..f90a043 100644
--- a/data/login
+++ b/data/login
@@ -1,5 +1,11 @@
 #! /bin/sh
 
+
+xmes() {
+    echo "$1:
+$2" | iconv -f utf8 -t koi8-r - | xargs xmessage -buttons OK:0 -default OK
+}
+
 env-update
 source /etc/profile
 
@@ -20,8 +26,7 @@ then
   if [ "$?" -gt "0" ];
   then
     echo $ERRORLOG >> $FILE_LOG
-    xmessage -buttons OK:0 -default OK "cl-sync:
-$ERRORLOG"
+        xmes cl-sync "$ERRORLOG"
     exit 1
   fi
 fi
@@ -36,11 +41,9 @@ then
     ERRORLOG2=`/usr/bin/cl-sync --color=never --logout --nosync $USER`
     if [ "$?" -gt "0" ];
     then
-	xmessage -buttons OK:0 -default OK "cl-sync:
-$ERRORLOG2"
+        xmes cl-sync "$ERRORLOG2"
     fi
-    xmessage -buttons OK:0 -default OK "cl-createhome:
-$ERRORLOG"
+        xmes cl-createhome "$ERRORLOG"
     exit 1
   fi
 fi