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