From 7295c5db4b10d3b05bd437d51fabade559ed7418 Mon Sep 17 00:00:00 2001
From: asamoukin <asamoukin@c91db197-33c1-4113-bf15-f8a5c547ca64>
Date: Thu, 20 Aug 2009 09:39:19 +0000
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=20=D0=B2=D1=8B=D0=B2=D0=BE=D0=B4=20=D0=BE=D1=88=D0=B8?=
 =?UTF-8?q?=D0=B1=D0=BE=D0=BA=20=D0=BE=D1=82=20=D1=81=D0=BA=D1=80=D0=B8?=
 =?UTF-8?q?=D0=BF=D1=82=D0=BE=D0=B2=20=D0=B2=20=D0=B3=D1=80=D0=B0=D1=84?=
 =?UTF-8?q?=D0=B8=D1=87=D0=B5=D1=81=D0=BA=D0=BE=D0=B5=20=D0=BE=D0=BA=D0=BD?=
 =?UTF-8?q?=D0=BE?=
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@2509 c91db197-33c1-4113-bf15-f8a5c547ca64
---
 data/login | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/data/login b/data/login
index aa8061a..ff3d82f 100644
--- a/data/login
+++ b/data/login
@@ -39,7 +39,7 @@ fi
 echo -n "" > $FILE_LOG
 if [ -e '/usr/bin/cl-sync' ];
 then
-  ERRORLOG=`/usr/bin/cl-sync --progress --color=never --login $USER`
+  ERRORLOG=`/usr/bin/cl-sync --progress --color=never --login $USER 2>&1`
   # при неудачном выполнении, сгенерируем ошибку
   if [ "$?" -gt "0" ];
   then
@@ -52,12 +52,12 @@ fi
 
 if [ -e '/usr/bin/cl-createhome' ];
 then
-  ERRORLOG=`/usr/bin/cl-createhome --progress --color=never $USER`
+  ERRORLOG=`/usr/bin/cl-createhome --progress --color=never $USER 2>&1`
   # при неудачном выполнении, сгенерируем ошибку
   if [ "$?" -gt "0" ];
   then
     echo "$ERRORLOG" >> $FILE_LOG
-    ERRORLOG2=`/usr/bin/cl-sync --color=never --logout --nosync $USER`
+    ERRORLOG2=`/usr/bin/cl-sync --color=never --logout --nosync $USER 2>&1`
     if [ "$?" -gt "0" ];
     then
         xmes cl-sync "$ERRORLOG2"