/[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 6779 by niro,
Tue Jul 21 12:18:38 2015 UTC
+revision 6780 by niro,
Tue Jul 21 14:47:40 2015 UTC
 Line 7 
 fix_whitespaces()
  	echo "${var//\ /_}"
  }
+ sanitize_store()
+ {
+ 	local var="$@"
+ 	echo "$(fix_whitespaces ${var})" | sed -e 's:\::_:g' -e 's:\/:_:g' | tr '[A-Z]' '[a-z]'
+ }
  # helper function to create citrix session files
  generate_ica_session_file()
  {
-Line 95 
 generate_storefront_sh()
+Line 101 
 generate_storefront_sh()
  	local ses_domain
  	local ses_password
  	local ses_browseradrs
+ 	local method
+ 	local ses_method
+ 	local name
  	# very basic getops
  	for i in $*
-Line 106 
 generate_storefront_sh()
+Line 115 
 generate_storefront_sh()
  			--password) shift; ses_password="$1" ;;
  			--domain) shift; ses_domain="$1" ;;
  			--server) shift; ses_browseradrs="$1" ;;
+ 			--method) shift; method="$1" ;;
  		esac
  		shift
  	done
+ 	# abort if name, dest or exec not given
+ 	[[ -z ${ses_filename} ]] && return 1
+ 	[[ -z ${ses_username} ]] && return 1
+ 	[[ -z ${ses_password} ]] && return 1
+ 	[[ -z ${ses_domain} ]] && return 1
+ 	[[ -z ${ses_browseradrs} ]] && return 1
+ 	case "${method}" in
+ 		enumerate)
+ 			ses_method="${method}"
+ 			name="store-enumerate"
+ 			;;
+ 		launch)
+ 			ses_method="${method}"
+ 			name="${ses_session}"
+ 			[[ -z ${ses_session} ]] && return 1
+ 			;;
+ 		*) echo "generate_storefront_sh(): wrong method given, either 'launch' or 'enumerate' are allowed."
+ 			return 1
+ 			;;
+ 	esac
  	generate_program_sh \
- 		--name "${ses_session}" \
+ 		--name "${name}" \
  		--exec "storefront-resolver" \
- 		--param "launch '${ses_username}' '${ses_password}' '${ses_domain}' '${ses_session}'" \
+ 		--param "${method} '${ses_username}' '${ses_password}' '${ses_domain}' '${ses_session}'" \
  		--dest "${ALX_UNPRIV_HOME}/.alxprogs/$(fix_whitespaces ${ses_filename})" \
  		--environment "STORE=${ses_browseradrs}"
  }
-Line 472 
 config_sessions()
+Line 504 
 config_sessions()
  	local fbinit
  	local fbkeys
  	local progsh_path
+ 	local storefront_enumerate=0
+ 	local storefront_store
+ 	local _store
+ 	local all_storefront_stores=""
  	progsh_path="${ALX_UNPRIV_HOME}/.alxprogs"
-Line 551 
 config_sessions()
+Line 587 
 config_sessions()
  		fi
  	done
- 	# add autostart session
- 	if [[ ! -z ${cfg_autostart_session} ]]
- 	then
- 		# 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
  	if [ -f ${ALX_SKELETONS}/fluxbox/keys ]
  	then
-Line 591 
 config_sessions()
+Line 620 
 config_sessions()
  		# generate STOREFRONT/PNABROWSE compatible session
  		case "${cfg_sessions_browseradrs}" in
  			"http://"*|"https://"* )
+ 				# run storefront_enumerate on startup to get all available sessions
+ 				storefront_enumerate=1
+ 				storefront_store="$(sanitize_store ${cfg_sessions_browseradrs})"
+ 				store_found=0
+ 				for _store in ${all_storefront_stores}
+ 				do
+ 					if [[ ${storefront_store} = ${_store} ]]
+ 					then
+ 						store_found=1
+ 					fi
+ 				done
+ 				if [[ ${store_found} = 0 ]]
+ 				then
+ 					all_storefront_stores="${all_storefront_stores} ${storefront_store}"
+ 					generate_storefront_sh \
+ 						--method "enumerate" \
+ 						--filename "store-enumerate_${storefront_store}_.sh" \
+ 						--username "${cfg_sessions_username}" \
+ 						--password "${cfg_sessions_password}" \
+ 						--domain "${cfg_sessions_domain}" \
+ 						--server "${cfg_sessions_browseradrs}"
+ 				fi
  				# generate STOREFRONT/PNABROWSE compatible session
  				generate_storefront_sh \
+ 					--method "launch" \
  					--session "${cfg_sessions_session}" \
  					--filename "$(fix_whitespaces ${cfg_sessions_filename})" \
  					--username "${cfg_sessions_username}" \
-Line 623 
 config_sessions()
+Line 676 
 config_sessions()
  		# fluxbox menusession
  		addconfig "[exec] (${cfg_sessions_session}) {${progsh_path}/$(fix_whitespaces ${cfg_sessions_filename})}"
  	done
+ 	if [[ ${storefront_enumerate} = 1 ]]
+ 	then
+ 		for _store in ${all_storefront_stores}
+ 		do
+ 			CONFIG="${ALX_UNPRIV_HOME}/.fluxbox/apps"
+ 			addconfig "[startup] {${progsh_path}/store-enumerate_${_store}_.sh &}"
+ 		done
+ 	fi
  	# add other menuitems
  	for i in ${all_other_ids}
-Line 648 
 config_sessions()
+Line 709 
 config_sessions()
  			--dest "${progsh_path}/$(fix_whitespaces ${cfg_other_menuitems_name})" \
  			"${workdir}"
+ 		CONFIG="${ALX_UNPRIV_HOME}/.fluxbox/menu"
  		addconfig "[exec] (${cfg_other_menuitems_name}) {${progsh_path}/$(fix_whitespaces ${cfg_other_menuitems_name})} ${cfg_other_menuitems_icon}"
  	done
-Line 682 
 config_sessions()
+Line 744 
 config_sessions()
  				--dest "${progsh_path}/$(fix_whitespaces ${PLUGIN_MENUITEM_NAME})" \
  				"${workdir}"
+ 			CONFIG="${ALX_UNPRIV_HOME}/.fluxbox/menu"
  			addconfig "[exec] (${PLUGIN_MENUITEM_NAME}) {${progsh_path}/$(fix_whitespaces ${PLUGIN_MENUITEM_NAME})} ${PLUGIN_MENUITEM_ICON}"
  		fi
-Line 693 
 config_sessions()
+Line 756 
 config_sessions()
  		unset PLUGIN_MENUITEM_ICON
  	done
+ 	# add autostart session
+ 	if [[ ! -z ${cfg_autostart_session} ]]
+ 	then
+ 		CONFIG="${ALX_UNPRIV_HOME}/.fluxbox/apps"
+ 		# 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 menu footer
- 	cat ${ALX_SKELETONS}/fluxbox/menu.footer >> ${ALX_UNPRIV_HOME}/.fluxbox/menu
+ 	CONFIG="${ALX_UNPRIV_HOME}/.fluxbox/menu"
+ 	cat ${ALX_SKELETONS}/fluxbox/menu.footer >> ${CONFIG}
  	# add a newline (maybe there is no crlf in the footer)
  	addconfig

 Legend:



Removed from v.6779
 


changed lines


 
Added in v.6780
 Legend:



Removed from v.6779
 


changed lines


 
Added in v.6780
-Removed from v.6779
+Added in v.6780