Merge branch 'master' of git.calculate.ru:/calculate-desktop

data/login.d/20desktop

@@ -17,14 +17,14 @@ env-update
 source /etc/profile
 source /usr/share/calculate-2.2/xdm/functions
 
-if [ -e '/usr/bin/cl-createhome' ];
+if [ -e '/usr/bin/cl-desktop' ];
 then
-  ERRORLOG=`/usr/bin/cl-createhome --progress --color=never $USER 2>&1`
+  ERRORLOG=`/usr/bin/cl-desktop --progress --color=never $USER 2>&1`
   # при неудачном выполнении, сгенерируем ошибку
   if [ "$?" -gt "0" ];
   then
     echo "$ERRORLOG" >> $FILE_LOG
-    xmes cl-createhome "$ERRORLOG"
+    xmes cl-desktop "$ERRORLOG"
     exit 1
   fi
 fi

data/xdm

@@ -99,7 +99,7 @@ if [ $? -ne 0 ]; then
 fi
 eval set -- "$OPTS"
 
-EXECDIR=/etc/calculate/xdm
+EXECDIR=/usr/share/calculate-2.2/xdm
 
 if [[ -w $FILE_LOG ]]; then
 	# Очистим лог ошибок
@@ -113,13 +113,13 @@ while [ $# -gt 0 ]; do
 		exit 0
 		;;
 	--login)
-		[[ $EXECDIR == /etc/calculate/xdm ]] || 
+		[[ $EXECDIR == /usr/share/calculate-2.2/xdm ]] || 
 			die "only one of --login or --logout must be specified"
 		EXECDIR=${EXECDIR}/login.d
 		shift 1
 		;;
 	--logout)
-		[[ $EXECDIR == /etc/calculate/xdm ]] || 
+		[[ $EXECDIR == /usr/share/calculate-2.2/xdm ]] || 
 			die "only one of --login or --logout must be specified"
 		EXECDIR=${EXECDIR}/logout.d
 		shift 1
@@ -132,7 +132,7 @@ while [ $# -gt 0 ]; do
 		;;
 	esac
 done
-if [[ $EXECDIR == /etc/calculate/xdm ]]; then
+if [[ $EXECDIR == /usr/share/calculate-2.2/xdm ]]; then
 	die "must specify option"
 fi
 
@@ -150,4 +150,4 @@ do
 done
 
 [[ -n $BG_PID ]] && kill $BG_PID
-exit 0
+exit 0