From 7d0e3b8a2a3bf783140416e6105cd7ab643920e0 Mon Sep 17 00:00:00 2001
From: mhiretskiy <mhiretskiy@c91db197-33c1-4113-bf15-f8a5c547ca64>
Date: Wed, 3 Jun 2009 12:29:06 +0000
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BE=D0=BA?=
 =?UTF-8?q?=20=D1=81=D0=BA=D1=80=D0=B8=D0=BF=D1=82=D0=B0=20login=20=D0=B8?=
 =?UTF-8?q?=20cmd=5Flogin?=
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@1616 c91db197-33c1-4113-bf15-f8a5c547ca64
---
 data/cmd_login |  4 ++--
 data/login     | 17 ++++++++++++-----
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/data/cmd_login b/data/cmd_login
index 8a6c61a..2b8eebe 100644
--- a/data/cmd_login
+++ b/data/cmd_login
@@ -5,9 +5,9 @@ FILE_LOG="${PATH_LOG}/cl_login-error.log"
 if [ -e $FILE_LOG ];
 then
   ERROR=`cat $FILE_LOG`
-  if [ $ERROR ];
+  if [ "$ERROR" ];
   then
     exit 1
   fi
 fi
-exit 0
\ No newline at end of file
+exit 0
diff --git a/data/login b/data/login
index 14cdcee..aa8061a 100644
--- a/data/login
+++ b/data/login
@@ -2,8 +2,8 @@
 
 
 xmes() {
-    echo "$1:
-$2" | iconv -f utf8 -t koi8-r - | xargs xmessage -buttons OK:0 -default OK
+    xmessage -buttons OK:0 -default OK "`echo \"$1:
+$2\" | iconv -f utf8 -t koi8-r - `"
 }
 
 if [[ "`ps axeo command | grep xdm/logout | grep -v grep | \
@@ -29,27 +29,34 @@ then
   # Создадим директорию логов
   mkdir $PATH_LOG
 fi
+# если права на файл не ровны 
+if [[ "`stat /var/log/calculate | sed -n -r '/Access: \(/ {s/.*\([0-9]([^/]+).*/\1/;p}'`" != "755" ]];
+then
+    chmod 755 $PATH_LOG
+fi
+
 # Очистим лог ошибок
-echo -n > $FILE_LOG
+echo -n "" > $FILE_LOG
 if [ -e '/usr/bin/cl-sync' ];
 then
   ERRORLOG=`/usr/bin/cl-sync --progress --color=never --login $USER`
   # при неудачном выполнении, сгенерируем ошибку
   if [ "$?" -gt "0" ];
   then
-    echo $ERRORLOG >> $FILE_LOG
+    echo "$ERRORLOG" >> $FILE_LOG
         xmes cl-sync "$ERRORLOG"
     exit 1
   fi
 fi
 
+
 if [ -e '/usr/bin/cl-createhome' ];
 then
   ERRORLOG=`/usr/bin/cl-createhome --progress --color=never $USER`
   # при неудачном выполнении, сгенерируем ошибку
   if [ "$?" -gt "0" ];
   then
-    echo $ERRORLOG >> $FILE_LOG
+    echo "$ERRORLOG" >> $FILE_LOG
     ERRORLOG2=`/usr/bin/cl-sync --color=never --logout --nosync $USER`
     if [ "$?" -gt "0" ];
     then