/[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 2149 by niro,
Tue May 17 11:47:17 2011 UTC
+revision 2408 by niro,
Wed Jun 15 12:54:42 2011 UTC
 Line 1
  # $Id$
  # configures ica-sessions on the host via mysql db settings
+ fix_whitespaces()
+ {
+ 	local var="$@"
+ 	echo "${var//\ /_}"
+ }
  # helper function to create citrix session files
  generate_ica_session_file()
  {
-Line 24 
 generate_ica_session_file()
+Line 30 
 generate_ica_session_file()
  			--username) shift; ses_username="$1" ;;
  			--password) shift; ses_password="$1" ;;
  			--domain) shift; ses_domain="$1" ;;
- 			--server) ses_browseradrs="$1" ;;
+ 			--server) shift; ses_browseradrs="$1" ;;
          	esac
  		shift
  	done
  	# abort if session, filename or server not given
- 	[[ -z ${session} ]] && return 1
+ 	[[ -z ${ses_session} ]] && return 1
- 	[[ -z ${file} ]] && return 1
+ 	[[ -z ${ses_filename} ]] && return 1
- 	[[ -z ${server} ]] && return 1
+ 	[[ -z ${ses_browseradrs} ]] && return 1
  	# write session files
  	CONFIG="${ALX_ICA_SESSIONS}/${ses_filename}"
-Line 74 
 generate_program_sh()
+Line 80 
 generate_program_sh()
  	local dest
  	local name
  	local exec
+ 	local param
  	local workdir
  	local CONFIG
-Line 83 
 generate_program_sh()
+Line 90 
 generate_program_sh()
  		case $1 in
  			--name|-n) shift; name="$1" ;;
  			--exec|-x) shift; exec="$1" ;;
+ 			--param|-p) shift; param="$1" ;;
  			--dest|-d) shift; dest="$1" ;;
  			--workdir|-w) shift; workdir="$1" ;;
          	esac
-Line 97 
 generate_program_sh()
+Line 105 
 generate_program_sh()
  	CONFIG="${dest}"
  	addconfig "#!/bin/sh"
  	[ -n "${workdir}" ] && addconfig "cd ${workdir}"
- 	addconfig "exec ${exec}"
+ 	addconfig "exec ${exec} ${param}"
  	chmod 0755 "${dest}"
  }
-Line 115 
 generate_icon()
+Line 123 
 generate_icon()
  	local iheight
  	local deficon
  	local CONFIG
+ 	local utility
  	# very basic getops
  	for i in $*
-Line 134 
 generate_icon()
+Line 143 
 generate_icon()
  	done
  	# some sanity checks:
  	# abort if name or command not given
  	[[ -z ${name} ]] && return 1
  	[[ -z ${command} ]] && return 1
+ 	# which utility are we using idesk|xtdesk ?
+ 	if [ -x /usr/bin/idesk ]
+ 	then
+ 		utility="idesk"
+ 		[[ -z ${dest} ]] && dest="${ALX_UNPRIV_HOME}/.idesktop/${name}.lnk"
+ 	else
+ 		utility="xtdesk"
+ 		[[ -z ${dest} ]] && dest="${ALX_UNPRIV_HOME}/.xtdesktop/${name}.lnk"
+ 	fi
  	# use some defaults for icon, dest, {x,y}res
  	[[ -z ${xres} ]] && xres=30
  	[[ -z ${yres} ]] && xres=30
- 	[[ -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 150 
 generate_icon()
+Line 168 
 generate_icon()
  		icon="${ALX_SESSIONS_ICONS}/${deficon}"
  	fi
- 	CONFIG=${dest}
+ 	CONFIG="${dest}"
  	clearconfig
  	addconfig 'table Icon'
- 	addconfig '  Type: Program'
+ 	[[ ${utility} = xtdesk ]] && addconfig '  Type: Program'
  	addconfig "  Caption: ${name}"
  	addconfig "  Command: ${command}"
  	addconfig "  Icon: ${icon}"
-Line 164 
 generate_icon()
+Line 182 
 generate_icon()
  	# add these only if not zero
  	if [[ ! -z ${iwidth} ]] && [[ ! -z ${iheight} ]]
  	then
- 		addconfig "  IconWidth: ${iwidth}"
+ 		if [[ ${utility} = xtdesk ]]
- 		addconfig "  IconHeight: ${iheight}"
+ 		then
+ 			addconfig "  IconWidth: ${iwidth}"
+ 			addconfig "  IconHeight: ${iheight}"
+ 		fi
+ 		if [[ ${utility} = idesk ]]
+ 		then
+ 			addconfig "  Width: ${iwidth}"
+ 			addconfig "  Height: ${iheight}"
+ 		fi
  	fi
  	addconfig 'end'
-Line 180 
 generate_all_desktop_icons()
+Line 206 
 generate_all_desktop_icons()
  	local yres
  	local x
  	local y
- 	local item
+ 	local i
  	local name
  	local progsh_path
+ 	local utility
+ 	local dest
+ 	local rc
+ 	# which utility are we using idesk|xtdesk ?
+ 	if [ -x /usr/bin/idesk ]
+ 	then
+ 		utility="idesk"
+ 		dest="${ALX_UNPRIV_HOME}/.idesktop"
+ 		rc="${ALX_UNPRIV_HOME}/.ideskrc"
+ 	else
+ 		utility="xtdesk"
+ 		dest="${ALX_UNPRIV_HOME}/.xtdesktop"
+ 		rc="${ALX_UNPRIV_HOME}/.xtdeskrc"
+ 	fi
  	# progsh path
- 	progsh_path=${ALX_UNPRIV_HOME}/.alxprogs
+ 	progsh_path="${ALX_UNPRIV_HOME}/.alxprogs"
  	# get the resolution
  	res=$(mysqldo "select resolution from cfg_graphic where serial='${ALX_SERIAL}'")
  	# 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}
+ if [[ ${utility} = xtdesk ]]
+ then
+ 	# basic config
+ 	cat ${ALX_SKELETONS}/xtdesktop/xtdeskrc > ${ALX_UNPRIV_HOME}/.xtdesktop/xtdeskrc
+ fi
  	# default settings
  	declare -i x=30
  	declare -i y=30
  	# ica icons
- 	for item in ${session_list}
+ 	for i in ${session_list}
  	do
  		# abort if empty
- 		[[ -z ${item} ]] && continue
+ 		[[ -z ${i} ]] && continue
+ 		# get database information
+ 		evaluate_table cfg_sessions "where serial='${ALX_SERIAL}' and id='${i}'"
  		# new line if x > xres
  		if [ ${x} -ge ${xres} ]
-Line 233 
 generate_all_desktop_icons()
+Line 282 
 generate_all_desktop_icons()
  			[ ${x} -ge ${xres} ] && x=30
  		fi
- 		name="$(basename ${item} .ica)"
  		generate_icon \
- 			--name "${name}" \
+ 			--name "${cfg_sessions_session}" \
- 			--command "nice -n 19 wfica ${ALX_ICA_SESSIONS}/${item}" \
+ 			--command "nice -n 19 wfica ${ALX_ICA_SESSIONS}/$(fix_whitespaces ${cfg_sessions_filename})" \
- 			--icon "${ALX_SESSIONS_ICONS}/${name}.png" \
+ 			--icon "${ALX_SESSIONS_ICONS}/$(fix_whitespaces ${cfg_sessions_session}).png" \
- 			--dest "${ALX_UNPRIV_HOME}/.xtdesktop/${name}.lnk" \
+ 			--dest "${dest}/$(fix_whitespaces ${cfg_sessions_session}).lnk" \
  			--xres "${x}" \
  			--yres "${y}"
  		y=$((${y} + 80))
  	done
- 	for item in ${other_menuitem_list}
+ 	for i in ${other_menuitem_list}
  	do
  		# abort if empty
- 		[[ -z ${item} ]] && continue
+ 		[[ -z ${i} ]] && continue
+ 		# get database information
+ 		evaluate_table cfg_other_menuitems "where serial='${ALX_SERIAL}' and id='${i}'"
  		# new line if x > xres
  		if [ ${x} -ge ${xres} ]
-Line 268 
 generate_all_desktop_icons()
+Line 319 
 generate_all_desktop_icons()
  		fi
  		generate_icon \
- 			--name "${item}" \
+ 			--name "${cfg_other_menuitems_name}" \
- 			--command "${progsh_path}/${item}" \
+ 			--command "${progsh_path}/$(fix_whitespaces ${cfg_other_menuitems_name})" \
- 			--icon "${ALX_SESSIONS_ICONS}/${item}.png" \
+ 			--icon "${ALX_SESSIONS_ICONS}/$(fix_whitespaces ${cfg_other_menuitems_name}).png" \
- 			--dest "${ALX_UNPRIV_HOME}/.xtdesktop/${item}.lnk" \
+ 			--dest "${dest}/$(fix_whitespaces ${cfg_other_menuitems_name}).lnk" \
  			--xres "${x}" \
  			--yres "${y}" \
  			--default-icon "default_item.png"
-Line 301 
 generate_all_desktop_icons()
+Line 352 
 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 315 
 config_sessions()
+Line 366 
 config_sessions()
  	local all_other_ids
  	local CONFIG
  	local screensaver_passwd_cmd
- 	local all_sessions
- 	local all_other_menuitems
  	# get all session ids from database
  	all_ses_ids=$(mysqldo "select id from cfg_sessions where serial='${ALX_SERIAL}'")
-Line 359 
 config_sessions()
+Line 408 
 config_sessions()
  	# add autostart session
  	if [[ ! -z ${cfg_autostart_session} ]]
  	then
- 		addconfig "[startup] {nohup nice -n 19 wfica ${ALX_ICA_SESSIONS}/${cfg_autostart_session} &}"
+ 		# sleep one second to wait until busybox is fully initialized and the screen is really centered
+ 		addconfig "[startup] {sleep 1 && nohup nice -n 19 wfica ${ALX_ICA_SESSIONS}/$(fix_whitespaces ${cfg_autostart_session}) &}"
  	fi
  	# fluxbox hotkeys
  	cat ${ALX_SKELETONS}/fluxbox/keys > ${ALX_UNPRIV_HOME}/.fluxbox/keys
  	# generate a fluxbox menu
- 	CONFIG=${ALX_UNPRIV_HOME}/.fluxbox/menu
+ 	CONFIG="${ALX_UNPRIV_HOME}/.fluxbox/menu"
  	clearconfig
  	# fluxbox menu header
-Line 383 
 config_sessions()
+Line 433 
 config_sessions()
  		evaluate_table cfg_sessions "where serial='${ALX_SERIAL}' and id='${i}'"
  		generate_ica_session_file \
  			--session "${cfg_sessions_session}" \
- 			--filename "${cfg_sessions_filename}" \
+ 			--filename "$(fix_whitespaces ${cfg_sessions_filename})" \
  			--username "${cfg_sessions_username}" \
  			--password "${cfg_sessions_password}" \
  			--domain "${cfg_sessions_domain}" \
  			--server "${cfg_sessions_browseradrs}"
  		# fluxbox menusession
- 		addconfig "[exec] (${cfg_sessions_session}) {nice -n 19 wfica ${ALX_ICA_SESSIONS}/${cfg_sessions_filename}}"
+ 		addconfig "[exec] (${cfg_sessions_session}) {nice -n 19 wfica ${ALX_ICA_SESSIONS}/$(fix_whitespaces ${cfg_sessions_filename})}"
- 		# add to all_sessions variable to create icons later for these
- 		all_sessions="${all_sessions} ${cfg_sessions_filename}"
  	done
  	# delete all progs
-Line 421 
 config_sessions()
+Line 468 
 config_sessions()
  		generate_program_sh \
  			--name "${cfg_other_menuitems_name}" \
  			--exec "${cfg_other_menuitems_exec}" \
- 			--dest "${progsh_path}/${cfg_other_menuitems_name}" \
+ 			--param "${cfg_other_menuitems_param}" \
- 			"${cfg_other_menuitems_workdir}"
+ 			--dest "${progsh_path}/$(fix_whitespaces ${cfg_other_menuitems_name})" \
+ 			"${workdir}"
- 		addconfig "[exec] (${cfg_other_menuitems_name}) {${progsh_path}/${cfg_other_menuitems_name}} ${cfg_other_menuitems_icon}"
- 		# add to all_other_menuitems variable to create icons later for these
+ 		addconfig "[exec] (${cfg_other_menuitems_name}) {${progsh_path}/$(fix_whitespaces ${cfg_other_menuitems_name})} ${cfg_other_menuitems_icon}"
- 		all_other_menuitems="${all_other_menuitems} ${cfg_other_menuitems_name}"
  	done
  	# fluxbox menu footer
-Line 436 
 config_sessions()
+Line 481 
 config_sessions()
  	addconfig
  	# now it's a good time to generate *all* icons :)
- 	generate_all_desktop_icons "${all_sessions}" "${all_other_menuitems}"
+ 	generate_all_desktop_icons "${all_ses_ids}" "${all_other_ids}"
  	# fix permissions
  	chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}

 Legend:



Removed from v.2149
 


changed lines


 
Added in v.2408
 Legend:



Removed from v.2149
 


changed lines


 
Added in v.2408
-Removed from v.2149
+Added in v.2408