--- alx-src/trunk/alxconfig-ng/functions/config_sessions.sh 2005/08/18 02:50:47 290 +++ alx-src/trunk/alxconfig-ng/functions/config_sessions.sh 2005/08/18 02:51:16 291 @@ -1,18 +1,18 @@ -# $Header: /home/cvsd/alx-cvs/alx-src/alxconfig-ng/functions/config_sessions.sh,v 1.9 2005-08-03 17:56:57 niro Exp $ +# $Header: /home/cvsd/alx-cvs/alx-src/alxconfig-ng/functions/config_sessions.sh,v 1.10 2005-08-18 02:51:16 niro Exp $ # configures ica-sessions on the host via mysql db settings get_sessions_settings() { local x i all count - #all arrays: + # all arrays: # -> session1 session2 ... sessionN - #get settings from database + # get settings from database all=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \ "select filename from cfg_sessions where serial='${ALX_SERIAL}'") - #split'em up and put in an array (only if $all not zero) + # split'em up and put in an array (only if $all not zero) declare -i i=0 if [ -n "${all}" ] then @@ -31,7 +31,7 @@ get_autostart_settings() { - #get settings from database + # get settings from database ALX_AUTOSTART=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \ "select session from cfg_autostart where serial='${ALX_SERIAL}'") @@ -52,7 +52,7 @@ local ses_browseradrs local ses_colors - #get settings from database + # get settings from database all_ids=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \ "select id from cfg_sessions where serial='${ALX_SERIAL}'") @@ -125,10 +125,10 @@ { local x i count name exec icon workdir - #all arrays: + # all arrays: # -> session1 session2 ... sessionN - #get settings from database + # get settings from database count=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \ "select name from cfg_other_menuitems where serial='${ALX_SERIAL}'") @@ -172,7 +172,7 @@ # generate ica session files generate_ica_session_files - #first of all get the vars + # first of all get the vars get_sessions_settings get_autostart_settings @@ -220,6 +220,11 @@ cat ${ALX_SKELETONS}/fluxbox/menu.header \ > ${ALX_UNPRIV_HOME}/.fluxbox/menu + # now fix it with proper messages :P + local ver="$(< /etc/mageversion)" + sed -i "s:@CHANGEME@:alx-${ver} #${ALX_SERIAL}:g" \ + ${ALX_UNPRIV_HOME}/.fluxbox/menu + # add a newline (maybe there is no crlf in the header) echo >> ${ALX_UNPRIV_HOME}/.fluxbox/menu