Update data for work with 3.1

data/functions

@@ -24,6 +24,5 @@ $2\" | iconv -f utf8 -t koi8-r - `"
 desktop_variable_value()
 {
     local varname=$1
-    cl-desktop $USER -vv --filter $varname | 
-        sed -rn "s/^$varname\s+\[[rw]\]\s+(.*)$/\1/p"
+    /usr/sbin/cl-core-variables-show --only-value $varname
 }

data/login.d/20desktop

@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright 2010 Calculate Ltd. http://www.calculate-linux.org
+# Copyright 2010-2012 Calculate Ltd. http://www.calculate-linux.org
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@ env-update
 source /etc/profile
 source /usr/share/calculate/xdm/functions
 
-if [ -e '/usr/bin/cl-desktop' ];
+if [ -e '/usr/sbin/cl-desktop' ];
 then
   # skip desktop configure if user not domain and it already has home dir
   # with not /etc/skel contents
@@ -27,14 +27,13 @@ then
      [[ -z "`ls ${userHome}`" ]] ||
      diff -uq <(ls -A1 /etc/skel | wc) <(ls -A1 ${userHome} | sort) &>/dev/null
   then
-    ERRORLOG=`/usr/bin/cl-desktop --progress --color=never $USER 2>&1`
+    ERRORLOG=`/usr/sbin/cl-desktop --gui-progress $USER 2>&1`
     # raise xmessage error if cl-desktop failed
     if [ "$?" -gt "0" ];
     then
       # write error message to logfile
       echo "$ERRORLOG" >> $FILE_LOG
       # display error by xmessage
-      xmes cl-desktop "$ERRORLOG"
       exit 1
     fi
   fi

data/login.d/99final

@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright 2008-2010 Calculate Ltd. http://www.calculate-linux.org
+# Copyright 2008-2012 Calculate Ltd. http://www.calculate-linux.org
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -14,6 +14,6 @@
 #  limitations under the License.
 
 
-# очистим кэш
+# clear kde cache
 /bin/rm -rf /var/tmp/kdecache-$USER
-exit 0
+exit 0

data/xdm

@@ -147,7 +147,7 @@ FILELIST=$(find ${EXECDIR} -type f | sort)
 [[ $FILELIST ]] || warning "${EXECDIR} hasn't scripts"
 
 gtk_background
-DOMAIN_USER="`desktop_variable_value ur_domain_set`"
+DOMAIN_USER="`desktop_variable_value desktop.ur_domain_set`"
 for script in $FILELIST
 do
 	FILE_LOG=$FILE_LOG DOMAIN_USER=$DOMAIN_USER /bin/bash $script || die_xmes "failed on execute $script"