Diff of /alx-src/branches/alxconf-060/functions/config_sessions.sh

Parent Directory | Revision Log | Patch

	revision 2747 by niro, Thu Aug 11 19:50:58 2011 UTC	revision 3504 by niro, Thu Apr 19 13:27:58 2012 UTC
#	Line 313  generate_all_desktop_icons()	Line 313  generate_all_desktop_icons()
313	do	do
314	# abort if empty	# abort if empty
315	[[ -z ${i} ]] && continue	[[ -z ${i} ]] && continue
316
317	evaluate_table cfg_plugins "where serial='${ALX_SERIAL}' and id='${i}'"	evaluate_table cfg_plugins "where serial='${ALX_SERIAL}' and id='${i}'"
318	if [[ -x ${ALX_PLUGINS}/${cfg_plugins_plugin}/plugin.sh ]]	if [[ -x ${ALX_PLUGINS}/${cfg_plugins_plugin}/plugin.sh ]]
319	then	then
#	Line 436  config_sessions()	Line 436  config_sessions()
436	local screensaver_passwd_cmd	local screensaver_passwd_cmd
437	local fbinit	local fbinit
438	local fbkeys	local fbkeys
439		local progsh_path
440
441		progsh_path="${ALX_UNPRIV_HOME}/.alxprogs"
442
443	# get all session ids from database	# get all session ids from database
444	all_ses_ids=$(mysqldo "select id from cfg_sessions where serial='${ALX_SERIAL}'")	all_ses_ids=$(mysqldo "select id from cfg_sessions where serial='${ALX_SERIAL}'")
#	Line 495  config_sessions()	Line 498  config_sessions()
498	addconfig "[startup] {nohup xautolock -time ${cfg_screensaver_timeout} -locker 'xlock -mode ${cfg_screensaver_screensaver} ${screensaver_passwd_cmd}' > /dev/null &}"	addconfig "[startup] {nohup xautolock -time ${cfg_screensaver_timeout} -locker 'xlock -mode ${cfg_screensaver_screensaver} ${screensaver_passwd_cmd}' > /dev/null &}"
499	fi	fi
500
501		# add plugins autostart
502		for i in ${all_plugin_ids}
503		do
504		evaluate_table cfg_plugins "where serial='${ALX_SERIAL}' and id='${i}'"
505		if [[ -x ${ALX_PLUGINS}/${cfg_plugins_plugin}/plugin.sh ]]
506		then
507		eval $(${ALX_PLUGINS}/${cfg_plugins_plugin}/plugin.sh autostart)
508
509		if [[ ${PLUGIN_AUTOSTART} = 1 ]]
510		then
511		addconfig "[startup] {${progsh_path}/$(fix_whitespaces ${PLUGIN_MENUITEM_NAME}) &}"
512		fi
513		# unset all variables
514		unset PLUGIN_AUTOSTART
515		unset PLUGIN_MENUITEM_NAME
516		fi
517		done
518
519	# add autostart session	# add autostart session
520	if [[ ! -z ${cfg_autostart_session} ]]	if [[ ! -z ${cfg_autostart_session} ]]
521	then	then
#	Line 541  config_sessions()	Line 562  config_sessions()
562	done	done
563
564	# delete all progs	# delete all progs
	progsh_path="${ALX_UNPRIV_HOME}/.alxprogs"
565	[ -d ${progsh_path} ] && rm -rf ${progsh_path}	[ -d ${progsh_path} ] && rm -rf ${progsh_path}
566	install -d ${progsh_path}	install -d ${progsh_path}
567
#	Line 599  config_sessions()	Line 619  config_sessions()
619	generate_program_sh \	generate_program_sh \
620	--name "${PLUGIN_MENUITEM_NAME}" \	--name "${PLUGIN_MENUITEM_NAME}" \
621	--exec "${PLUGIN_MENUITEM_EXEC}" \	--exec "${PLUGIN_MENUITEM_EXEC}" \
622	--param "${PLUGIN_MENUITEM_PARM}" \	--param "${PLUGIN_MENUITEM_PARAM}" \
623	--dest "${progsh_path}/$(fix_whitespaces ${PLUGIN_MENUITEM_NAME})" \	--dest "${progsh_path}/$(fix_whitespaces ${PLUGIN_MENUITEM_NAME})" \
624	"${workdir}"	"${workdir}"
625
#	Line 627  config_sessions()	Line 647  config_sessions()
647	chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}/.fluxbox	chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}/.fluxbox
648	chmod 0755 ${ALX_UNPRIV_HOME}/.fluxbox	chmod 0755 ${ALX_UNPRIV_HOME}/.fluxbox
649	chmod 0755 ${ALX_UNPRIV_HOME}/.idesktop	chmod 0755 ${ALX_UNPRIV_HOME}/.idesktop
	chmod 0644 ${ALX_UNPRIV_HOME}/.ideskrc
650	}	}

---

Colored Diff Long Colored Diff Full Colored Diff Unidiff Context Diff Side by Side

Legend: Removed from v.2747   changed lines   Added in v.3504