/[alx-svn]/alx-src/branches/alxconf-060/functions/config_sessions.sh

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

Parent Directory | Revision Log | View Patch Patch

-revision 2161 by niro,
Wed May 18 14:35:13 2011 UTC
+revision 6765 by niro,
Tue Jul 21 12:18:38 2015 UTC
 Line 19 
 generate_ica_session_file()
  	local ses_domain
  	local ses_password
  	local ses_browseradrs
+ 	local ses_colors
  	local CONFIG
  	# very basic getops
-Line 31 
 generate_ica_session_file()
+Line 32 
 generate_ica_session_file()
  			--password) shift; ses_password="$1" ;;
  			--domain) shift; ses_domain="$1" ;;
  			--server) shift; ses_browseradrs="$1" ;;
-         	esac
+ 			--colordepth) shift; ses_colors="$1" ;;
+ 		esac
  		shift
  	done
-Line 57 
 generate_ica_session_file()
+Line 59 
 generate_ica_session_file()
  		# the first address must be named TcpBrowserAddress, but not TcpBrowserAddress1 !!
  		[[ ${i} -eq 1 ]] && num=""
  		addconfig "TcpBrowserAddress${num}=${server}"
+ 		addconfig "HttpBrowserAddress${num}=${server}"
  	done
  	addconfig 'ScreenPercent=0'
-Line 65 
 generate_ica_session_file()
+Line 68 
 generate_ica_session_file()
  	addconfig "[${ses_session}]"
  	addconfig "Address=${ses_session}"
  	addconfig "InitialProgram=#${ses_session}"
+ 	# convert to ica session file values
+ 	case ${ses_colors} in
+|32) ses_colors="8";;
+) ses_colors="4";;
+) ses_colors="2";;
+ 		*) ses_colors="4";; # default to 16bit
+ 	esac
+ 	addconfig "DesiredColor=${ses_colors}"
  	addconfig 'TransportDriver=TCP/IP'
  	addconfig 'WinStationDriver=ICA 3.0'
- 	addconfig "ClearPassword=${ses__password}"
+ 	addconfig "ClearPassword=${ses_password}"
  	addconfig "Username=${ses_username}"
  	addconfig "Domain=${ses_domain}"
  	addconfig 'UseFullScreen=Yes'
  	addconfig 'NoWindowManager=True'
  }
+ generate_storefront_sh()
+ {
+ 	local server
+ 	local ses_session
+ 	local ses_filename
+ 	local ses_username
+ 	local ses_domain
+ 	local ses_password
+ 	local ses_browseradrs
+ 	# very basic getops
+ 	for i in $*
+ 	do
+ 		case $1 in
+ 			--session) shift; ses_session="$1" ;;
+ 			--filename) shift; ses_filename="$1" ;;
+ 			--username) shift; ses_username="$1" ;;
+ 			--password) shift; ses_password="$1" ;;
+ 			--domain) shift; ses_domain="$1" ;;
+ 			--server) shift; ses_browseradrs="$1" ;;
+ 		esac
+ 		shift
+ 	done
+ 	generate_program_sh \
+ 		--name "${ses_session}" \
+ 		--exec "storefront-resolver" \
+ 		--param "launch '${ses_username}' '${ses_password}' '${ses_domain}' '${ses_session}'" \
+ 		--dest "${ALX_UNPRIV_HOME}/.alxprogs/$(fix_whitespaces ${ses_filename})" \
+ 		--environment "STORE=${ses_browseradrs}"
+ }
  # generates a sh file to start programs
  generate_program_sh()
  {
-Line 93 
 generate_program_sh()
+Line 137 
 generate_program_sh()
  			--param|-p) shift; param="$1" ;;
  			--dest|-d) shift; dest="$1" ;;
  			--workdir|-w) shift; workdir="$1" ;;
-         	esac
+ 			--environment|-e)  shift; environment="$1" ;;
+ 		esac
  		shift
  	done
-Line 104 
 generate_program_sh()
+Line 149 
 generate_program_sh()
  	CONFIG="${dest}"
  	addconfig "#!/bin/sh"
- 	[ -n "${workdir}" ] && addconfig "cd ${workdir}"
+ 	[[ -n ${environment} ]] && addconfig "export ${environment}"
+ 	[[ -n ${workdir} ]] && addconfig "cd ${workdir}"
  	addconfig "exec ${exec} ${param}"
  	chmod 0755 "${dest}"
-Line 123 
 generate_icon()
+Line 169 
 generate_icon()
  	local iheight
  	local deficon
  	local CONFIG
+ 	local utility
  	# very basic getops
  	for i in $*
-Line 137 
 generate_icon()
+Line 184 
 generate_icon()
  			--icon-width|-w) shift; iwidth="$1" ;;
  			--icon-height|-h) shift; iheight="$1" ;;
  			--default-icon) shift; deficon="$1" ;;
-         	esac
+ 		esac
  		shift
  	done
  	# some sanity checks:
  	# abort if name or command not given
  	[[ -z ${name} ]] && return 1
  	[[ -z ${command} ]] && return 1
+ 	[[ -z ${dest} ]] && dest="${ALX_UNPRIV_HOME}/.idesktop/${name}.lnk"
  	# use some defaults for icon, dest, {x,y}res
- 	[[ -z ${xres} ]] && xres=30
+ 	[[ -z ${xres} ]] && xres=50
- 	[[ -z ${yres} ]] && xres=30
+ 	[[ -z ${yres} ]] && xres=50
- 	[[ -z ${dest} ]] && dest="${ALX_UNPRIV_HOME}/.xtdesktop/${name}.lnk"
  	if [[ -z ${icon} ]] || [ ! -f ${icon} ]
  	then
  		# if no default icon is given use default.png
-Line 162 
 generate_icon()
+Line 210 
 generate_icon()
  	clearconfig
  	addconfig 'table Icon'
- 	addconfig '  Type: Program'
  	addconfig "  Caption: ${name}"
  	addconfig "  Command: ${command}"
  	addconfig "  Icon: ${icon}"
-Line 172 
 generate_icon()
+Line 219 
 generate_icon()
  	# add these only if not zero
  	if [[ ! -z ${iwidth} ]] && [[ ! -z ${iheight} ]]
  	then
- 		addconfig "  IconWidth: ${iwidth}"
+ 		addconfig "  Width: ${iwidth}"
- 		addconfig "  IconHeight: ${iheight}"
+ 		addconfig "  Height: ${iheight}"
  	fi
  	addconfig 'end'
-Line 183 
 generate_all_desktop_icons()
+Line 230 
 generate_all_desktop_icons()
  {
  	local session_list="$1"
  	local other_menuitem_list="$2"
+ 	local plugin_list="$3"
  	local res
  	local xres
  	local yres
-Line 191 
 generate_all_desktop_icons()
+Line 239 
 generate_all_desktop_icons()
  	local i
  	local name
  	local progsh_path
+ 	local utility
+ 	local dest
+ 	local rc
+ 	dest="${ALX_UNPRIV_HOME}/.idesktop"
+ 	rc="${ALX_UNPRIV_HOME}/.ideskrc"
  	# progsh path
  	progsh_path="${ALX_UNPRIV_HOME}/.alxprogs"
-Line 200 
 generate_all_desktop_icons()
+Line 254 
 generate_all_desktop_icons()
  	# split res to x & y
  	xres="${res%x*}"
- 	xres="${res#*x}"
+ 	yres="${res#*x}"
  	# top left edge of the icon is given in config file
  	# remove a little bit to simulate the bottom-right edge
  	xres="$(( ${xres} - 120 ))"
  	yres="$(( ${yres} - 80 ))"
- 	# basic config
- 	cat ${ALX_SKELETONS}/xtdesktop/xtdeskrc > ${ALX_UNPRIV_HOME}/.xtdeskrc
  	# clean desktop icon location
- 	[ -d ${ALX_UNPRIV_HOME}/.xtdesktop ] && rm -rf ${ALX_UNPRIV_HOME}/.xtdesktop
+ 	[ -d ${dest} ] && rm -rf ${dest}
- 	install -d ${ALX_UNPRIV_HOME}/.xtdesktop
+ 	[ -f ${rc} ] && rm -f ${rc}
+ 	install -d ${dest}
  	# default settings
- 	declare -i x=30
+ 	declare -i x=50
- 	declare -i y=30
+ 	declare -i y=50
  	# ica icons
  	for i in ${session_list}
-Line 230 
 generate_all_desktop_icons()
+Line 282 
 generate_all_desktop_icons()
  		# new line if x > xres
  		if [ ${x} -ge ${xres} ]
  		then
- 			x=30
+ 			x=50
  			y=$((${y} + 80))
  		fi
-Line 238 
 generate_all_desktop_icons()
+Line 290 
 generate_all_desktop_icons()
  		if [ ${y} -ge ${yres} ]
  		then
  			x=$((${x} + 120))
- 			y=30
+ 			y=50
  			# re-check x
- 			[ ${x} -ge ${xres} ] && x=30
+ 			[ ${x} -ge ${xres} ] && x=50
  		fi
  		generate_icon \
- 			--name "${cfg_session_session}" \
+ 			--name "${cfg_sessions_session}" \
- 			--command "nice -n 19 wfica ${ALX_ICA_SESSIONS}/$(fix_whitespaces ${cfg_session_filename})" \
+ 			--command "${progsh_path}/$(fix_whitespaces ${cfg_sessions_filename})" \
- 			--icon "${ALX_SESSIONS_ICONS}/$(fix_whitespaces ${cfg_session_session}).png" \
+ 			--icon "${ALX_SESSIONS_ICONS}/$(fix_whitespaces ${cfg_sessions_session}).png" \
- 			--dest "${ALX_UNPRIV_HOME}/.xtdesktop/$(fix_whitespaces ${cfg_session_session}).lnk" \
+ 			--dest "${dest}/$(fix_whitespaces ${cfg_sessions_session}).lnk" \
  			--xres "${x}" \
  			--yres "${y}"
-Line 266 
 generate_all_desktop_icons()
+Line 318 
 generate_all_desktop_icons()
  		# new line if x > xres
  		if [ ${x} -ge ${xres} ]
  		then
- 			x=30
+ 			x=50
  			y=$((${y} + 80))
  		fi
-Line 274 
 generate_all_desktop_icons()
+Line 326 
 generate_all_desktop_icons()
  		if [ ${y} -ge ${yres} ]
  		then
  			x=$((${x} + 120))
- 			y=30
+ 			y=50
  			# re-check x
- 			[ ${x} -ge ${xres} ] && x=30
+ 			[ ${x} -ge ${xres} ] && x=50
  		fi
  		generate_icon \
  			--name "${cfg_other_menuitems_name}" \
- 			--command "${progsh_path}/$(fix_whitespaces ${cfg_other_menuitems_exec})" \
+ 			--command "${progsh_path}/$(fix_whitespaces ${cfg_other_menuitems_name})" \
- 			--icon "${ALX_SESSIONS_ICONS}/$(fix_whitespaces ${cfg_other_menuitems_name}).png" \
+ 			--icon "${ALX_SESSIONS_ICONS}/$(fix_whitespaces ${cfg_other_menuitems_icon}).png" \
- 			--dest "${ALX_UNPRIV_HOME}/.xtdesktop/$(fix_whitespaces ${cfg_other_menuitems_name}).lnk" \
+ 			--dest "${dest}/$(fix_whitespaces ${cfg_other_menuitems_name}).lnk" \
  			--xres "${x}" \
  			--yres "${y}" \
  			--default-icon "default_item.png"
  		y=$((${y} + 80))
  	done
+ 	for i in ${plugin_list}
+ 	do
+ 		# abort if empty
+ 		[[ -z ${i} ]] && continue
+ 		evaluate_table cfg_plugins "where serial='${ALX_SERIAL}' and id='${i}'"
+ 		if [[ -x ${ALX_PLUGINS}/${cfg_plugins_plugin}/plugin.sh ]]
+ 		then
+ 			eval $(${ALX_PLUGINS}/${cfg_plugins_plugin}/plugin.sh menuitem)
+ 			# abort if name or exec is empty
+ 			[[ -z ${PLUGIN_MENUITEM_NAME} ]] && continue
+ 			[[ -z ${PLUGIN_MENUITEM_EXEC} ]] && continue
+ 			# new line if x > xres
+ 			if [ ${x} -ge ${xres} ]
+ 			then
+ 				x=50
+ 				y=$((${y} + 80))
+ 			fi
+ 			# new row if y > yres
+ 			if [ ${y} -ge ${yres} ]
+ 			then
+ 				x=$((${x} + 120))
+ 				y=50
+ 				# re-check x
+ 				[ ${x} -ge ${xres} ] && x=50
+ 			fi
+ 			generate_icon \
+ 				--name "${PLUGIN_MENUITEM_NAME}" \
+ 				--command "${progsh_path}/$(fix_whitespaces ${PLUGIN_MENUITEM_NAME})" \
+ 				--icon "${ALX_SESSIONS_ICONS}/$(fix_whitespaces ${PLUGIN_MENUITEM_NAME}).png" \
+ 				--dest "${dest}/$(fix_whitespaces ${PLUGIN_MENUITEM_NAME}).lnk" \
+ 				--xres "${x}" \
+ 				--yres "${y}" \
+ 				--default-icon "default_item.png"
+ 			y=$((${y} + 80))
+ 		fi
+ 		# unset all variables
+ 		unset PLUGIN_MENUITEM_NAME
+ 		unset PLUGIN_MENUITEM_EXEC
+ 		unset PLUGIN_MENUITEM_PARAM
+ 		unset PLUGIN_MENUITEM_WORKDIR
+ 		unset PLUGIN_MENUITEM_ICON
+ 	done
+ 	# add shutdown, reboot icons
+ 	for i in shutdown reboot
+ 	do
+ 		# new line if x > xres
+ 		if [ ${x} -ge ${xres} ]
+ 		then
+ 			x=50
+ 			y=$((${y} + 80))
+ 		fi
+ 		# new row if y > yres
+ 		if [ ${y} -ge ${yres} ]
+ 		then
+ 			x=$((${x} + 120))
+ 			y=50
+ 			# re-check x
+ 			[ ${x} -ge ${xres} ] && x=50
+ 		fi
+ 		case ${i} in
+ 			shutdown) name="Herunterfahren" ;;
+ 			reboot) name="Neustarten" ;;
+ 		esac
+ 		generate_icon \
+ 			--name "${name}" \
+ 			--command "/usr/lib/alxconfig-ng/bin/user_${i}.sh" \
+ 			--icon "${ALX_SESSIONS_ICONS}/${i}.png" \
+ 			--dest "${dest}/${i}.lnk" \
+ 			--xres "${x}" \
+ 			--yres "${y}" \
+ 			--icon-width "40" \
+ 			--icon-height "40"
+ 		y=$((${y} + 80))
+ 	done
  	# last but not least gen a icon with some sys informations
  	local sysinfo
-Line 314 
 generate_all_desktop_icons()
+Line 455 
 generate_all_desktop_icons()
  		--name "${sysinfo}" \
  		--command "exit 0" \
  		--icon "${ALX_SESSIONS_ICONS}/sysinfo.png" \
- 		--dest "${ALX_UNPRIV_HOME}/.xtdesktop/sysinfo.lnk" \
+ 		--dest "${dest}/sysinfo.lnk" \
  		--xres "${xres}" \
  		--yres "${yres}" \
  		--icon-width "1" \
-Line 328 
 config_sessions()
+Line 469 
 config_sessions()
  	local all_other_ids
  	local CONFIG
  	local screensaver_passwd_cmd
+ 	local fbinit
+ 	local fbkeys
+ 	local progsh_path
+ 	progsh_path="${ALX_UNPRIV_HOME}/.alxprogs"
  	# get all session ids from database
  	all_ses_ids=$(mysqldo "select id from cfg_sessions where serial='${ALX_SERIAL}'")
- 	# get all other_menutiem ids from database
+ 	# get all other_menuitem ids from database
  	all_other_ids=$(mysqldo "select id from cfg_other_menuitems where serial='${ALX_SERIAL}'")
+ 	# get all plugin ids from database
+ 	all_plugin_ids=$(mysqldo "select id from cfg_plugins where serial='${ALX_SERIAL}'")
  	# get screensaver settings
  	evaluate_table cfg_screensaver
  	# get autostart settings
  	evaluate_table cfg_autostart
+ 	# get current color depth
+ 	evaluate_table cfg_graphic
  	# now setup fluxbox for user station
-Line 348 
 config_sessions()
+Line 498 
 config_sessions()
  	# now generate fluxbox config files
  	# fluxbox main config
- 	cat ${ALX_SKELETONS}/fluxbox/init > ${ALX_UNPRIV_HOME}/.fluxbox/init
+ 	if [ -f ${ALX_SKELETONS}/fluxbox/init ]
+ 	then
+ 		fbinit="${ALX_SKELETONS}/fluxbox/init"
+ 	else
+ 		fbinit="/usr/share/fluxbox/init"
+ 	fi
+ 	cat ${fbinit} > ${ALX_UNPRIV_HOME}/.fluxbox/init
  	# fluxbox autostart
- 	cat ${ALX_SKELETONS}/fluxbox/apps > ${ALX_UNPRIV_HOME}/.fluxbox/apps
  	CONFIG="${ALX_UNPRIV_HOME}/.fluxbox/apps"
+ 	# do not show decorations on messages generated with xmessage
+ 	if [ -x /usr/bin/xmessage ]
+ 	then
+ 		addconfig '[app] (xmessage)'
+ 		addconfig '	[Deco] {NONE}'
+ 		addconfig '[end]'
+ 	fi
+ 	# add icon utility
+ 	[ -x /usr/bin/idesk ] && addconfig '[startup] {nohup idesk > /dev/null &}'
+ 	# add numlock utility
+ 	[ -x /usr/bin/numlockx ] && addconfig '[startup] {nohup numlockx on &}'
  	# add screensaver
  	if [[ ! -z ${cfg_screensaver_screensaver} ]] && [[ ! -z ${cfg_screensaver_screensaver_timeout} ]]
  	then
-Line 367 
 config_sessions()
+Line 533 
 config_sessions()
  		addconfig "[startup] {nohup xautolock -time ${cfg_screensaver_timeout} -locker 'xlock -mode ${cfg_screensaver_screensaver} ${screensaver_passwd_cmd}' > /dev/null &}"
  	fi
+ 	# add plugins autostart
+ 	for i in ${all_plugin_ids}
+ 	do
+ 		evaluate_table cfg_plugins "where serial='${ALX_SERIAL}' and id='${i}'"
+ 		if [[ -x ${ALX_PLUGINS}/${cfg_plugins_plugin}/plugin.sh ]]
+ 		then
+ 			eval $(${ALX_PLUGINS}/${cfg_plugins_plugin}/plugin.sh autostart)
+ 			if [[ ${PLUGIN_AUTOSTART} = 1 ]]
+ 			then
+ 				addconfig "[startup] {${progsh_path}/$(fix_whitespaces ${PLUGIN_MENUITEM_NAME}) &}"
+ 			fi
+ 			# unset all variables
+ 			unset PLUGIN_AUTOSTART
+ 			unset PLUGIN_MENUITEM_NAME
+ 		fi
+ 	done
  	# add autostart session
  	if [[ ! -z ${cfg_autostart_session} ]]
  	then
- 		addconfig "[startup] {nohup nice -n 19 wfica ${ALX_ICA_SESSIONS}/$(fix_whitespaces ${cfg_autostart_session}) &}"
+ 		# sleep one second to wait until busybox is fully initialized and the screen is really centered
+ 		addconfig "[startup] {sleep 1 && ${progsh_path}/$(fix_whitespaces ${cfg_autostart_session}) &}"
  	fi
  	# fluxbox hotkeys
- 	cat ${ALX_SKELETONS}/fluxbox/keys > ${ALX_UNPRIV_HOME}/.fluxbox/keys
+ 	if [ -f ${ALX_SKELETONS}/fluxbox/keys ]
+ 	then
+ 		fbkeys="${ALX_SKELETONS}/fluxbox/keys"
+ 	else
+ 		fbkeys="/usr/share/fluxbox/keys"
+ 	fi
+ 	cat ${fbkeys} > ${ALX_UNPRIV_HOME}/.fluxbox/keys
  	# generate a fluxbox menu
  	CONFIG="${ALX_UNPRIV_HOME}/.fluxbox/menu"
-Line 388 
 config_sessions()
+Line 579 
 config_sessions()
  	# add a newline (maybe there is no crlf in the header)
  	addconfig
+ 	# delete all progs
+ 	[ -d ${progsh_path} ] && rm -rf ${progsh_path}
+ 	install -d ${progsh_path}
  	# first generate session files
  	for i in ${all_ses_ids}
  	do
  		evaluate_table cfg_sessions "where serial='${ALX_SERIAL}' and id='${i}'"
- 		generate_ica_session_file \
- 			--session "${cfg_sessions_session}" \
+ 		# generate STOREFRONT/PNABROWSE compatible session
- 			--filename "$(fix_whitespaces ${cfg_sessions_filename})" \
+ 		case "${cfg_sessions_browseradrs}" in
- 			--username "${cfg_sessions_username}" \
+ 			"http://"*|"https://"* )
- 			--password "${cfg_sessions_password}" \
+ 				# generate STOREFRONT/PNABROWSE compatible session
- 			--domain "${cfg_sessions_domain}" \
+ 				generate_storefront_sh \
- 			--server "${cfg_sessions_browseradrs}"
+ 					--session "${cfg_sessions_session}" \
+ 					--filename "$(fix_whitespaces ${cfg_sessions_filename})" \
+ 					--username "${cfg_sessions_username}" \
+ 					--password "${cfg_sessions_password}" \
+ 					--domain "${cfg_sessions_domain}" \
+ 					--server "${cfg_sessions_browseradrs}"
+ 				;;
+ 			*)
+ 				# generate ICA compatible session
+ 				generate_ica_session_file \
+ 					--session "${cfg_sessions_session}" \
+ 					--filename "$(fix_whitespaces ${cfg_sessions_filename})" \
+ 					--username "${cfg_sessions_username}" \
+ 					--password "${cfg_sessions_password}" \
+ 					--domain "${cfg_sessions_domain}" \
+ 					--server "${cfg_sessions_browseradrs}" \
+ 					--colordepth "${cfg_graphic_depth}"
+ 				# gen prog startup wrapper
+ 				generate_program_sh \
+ 					--name "$(fix_whitespaces ${cfg_sessions_filename})" \
+ 					--exec "wfica-launcher" \
+ 					--param "${ALX_ICA_SESSIONS}/$(fix_whitespaces ${cfg_sessions_filename})" \
+ 					--dest "${progsh_path}/$(fix_whitespaces ${cfg_sessions_filename})" \
+ 					"${workdir}"
+ 					;;
+ 		esac
  		# fluxbox menusession
- 		addconfig "[exec] (${cfg_sessions_session}) {nice -n 19 wfica ${ALX_ICA_SESSIONS}/$(fix_whitespaces ${cfg_sessions_filename})}"
+ 		addconfig "[exec] (${cfg_sessions_session}) {${progsh_path}/$(fix_whitespaces ${cfg_sessions_filename})}"
  	done
- 	# delete all progs
- 	progsh_path="${ALX_UNPRIV_HOME}/.alxprogs"
- 	[ -d ${progsh_path} ] && rm -rf ${progsh_path}
- 	install -d ${progsh_path}
  	# add other menuitems
  	for i in ${all_other_ids}
  	do
-Line 436 
 config_sessions()
+Line 651 
 config_sessions()
  		addconfig "[exec] (${cfg_other_menuitems_name}) {${progsh_path}/$(fix_whitespaces ${cfg_other_menuitems_name})} ${cfg_other_menuitems_icon}"
  	done
+ 	# add plugins
+ 	for i in ${all_plugin_ids}
+ 	do
+ 		evaluate_table cfg_plugins "where serial='${ALX_SERIAL}' and id='${i}'"
+ 		if [[ -x ${ALX_PLUGINS}/${cfg_plugins_plugin}/plugin.sh ]]
+ 		then
+ 			eval $(${ALX_PLUGINS}/${cfg_plugins_plugin}/plugin.sh menuitem)
+ 			# abort if name or exec is empty
+ 			[[ -z ${PLUGIN_MENUITEM_NAME} ]] && continue
+ 			[[ -z ${PLUGIN_MENUITEM_EXEC} ]] && continue
+ 			# now echo config line for fluxbox-menu
+ 			# make it "configureable" :p
+ 			if [[ -n ${PLUGIN_MENUITEM_WORKDIR} ]]
+ 			then
+ 				workdir="--workdir ${PLUGIN_MENUITEM_WORKDIR}"
+ 			fi
+ 			if [[ -n ${PLUGIN_MENUITEM_ICON} ]]
+ 			then
+ 				PLUGIN_MENUITEM_ICON="<${PLUGIN_MENUITEM_ICON}>"
+ 			fi
+ 			# gen prog startup wrapper
+ 			generate_program_sh \
+ 				--name "${PLUGIN_MENUITEM_NAME}" \
+ 				--exec "${PLUGIN_MENUITEM_EXEC}" \
+ 				--param "${PLUGIN_MENUITEM_PARAM}" \
+ 				--dest "${progsh_path}/$(fix_whitespaces ${PLUGIN_MENUITEM_NAME})" \
+ 				"${workdir}"
+ 			addconfig "[exec] (${PLUGIN_MENUITEM_NAME}) {${progsh_path}/$(fix_whitespaces ${PLUGIN_MENUITEM_NAME})} ${PLUGIN_MENUITEM_ICON}"
+ 		fi
+ 		# unset all variables
+ 		unset PLUGIN_MENUITEM_NAME
+ 		unset PLUGIN_MENUITEM_EXEC
+ 		unset PLUGIN_MENUITEM_PARAM
+ 		unset PLUGIN_MENUITEM_WORKDIR
+ 		unset PLUGIN_MENUITEM_ICON
+ 	done
  	# fluxbox menu footer
  	cat ${ALX_SKELETONS}/fluxbox/menu.footer >> ${ALX_UNPRIV_HOME}/.fluxbox/menu
  	# add a newline (maybe there is no crlf in the footer)
  	addconfig
  	# now it's a good time to generate *all* icons :)
- 	generate_all_desktop_icons "${all_ses_ids}" "${all_other_ids}"
+ 	generate_all_desktop_icons "${all_ses_ids}" "${all_other_ids}" "${all_plugin_ids}"
  	# fix permissions
  	chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}
  	chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}/.fluxbox
  	chmod 0755 ${ALX_UNPRIV_HOME}/.fluxbox
- 	chmod 0755 ${ALX_UNPRIV_HOME}/.xtdesktop
+ 	chmod 0755 ${ALX_UNPRIV_HOME}/.idesktop
- 	chmod 0644 ${ALX_UNPRIV_HOME}/.xtdeskrc
  }

 Legend:



Removed from v.2161
 


changed lines


 
Added in v.6765
 Legend:



Removed from v.2161
 


changed lines


 
Added in v.6765
-Removed from v.2161
+Added in v.6765