Magellan Linux

  • Back to homepage
    • /[alx-svn]/alx-src/branches/alxconf-060/functions/config_sessions.sh

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

    Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

    revision 2149 by niro, Tue May 17 11:47:17 2011 UTC revision 3455 by niro, Fri Apr 13 17:03:05 2012 UTC
    # Line 1  Line 1 
    1  # $Id$  # $Id$
    2  # configures ica-sessions on the host via mysql db settings  # configures ica-sessions on the host via mysql db settings
    3    
    4    fix_whitespaces()
    5    {
    6     local var="$@"
    7     echo "${var//\ /_}"
    8    }
    9    
    10  # helper function to create citrix session files  # helper function to create citrix session files
    11  generate_ica_session_file()  generate_ica_session_file()
    12  {  {
    # Line 13  generate_ica_session_file() Line 19  generate_ica_session_file()
    19   local ses_domain   local ses_domain
    20   local ses_password   local ses_password
    21   local ses_browseradrs   local ses_browseradrs
    22     local ses_colors
    23   local CONFIG   local CONFIG
    24    
    25   # very basic getops   # very basic getops
    # Line 24  generate_ica_session_file() Line 31  generate_ica_session_file()
    31   --username) shift; ses_username="$1" ;;   --username) shift; ses_username="$1" ;;
    32   --password) shift; ses_password="$1" ;;   --password) shift; ses_password="$1" ;;
    33   --domain) shift; ses_domain="$1" ;;   --domain) shift; ses_domain="$1" ;;
    34   --server) ses_browseradrs="$1" ;;   --server) shift; ses_browseradrs="$1" ;;
    35     --colordepth) shift; ses_colors="$1" ;;
    36           esac           esac
    37   shift   shift
    38   done   done
    39    
    40   # abort if session, filename or server not given   # abort if session, filename or server not given
    41   [[ -z ${session} ]] && return 1   [[ -z ${ses_session} ]] && return 1
    42   [[ -z ${file} ]] && return 1   [[ -z ${ses_filename} ]] && return 1
    43   [[ -z ${server} ]] && return 1   [[ -z ${ses_browseradrs} ]] && return 1
    44    
    45   # write session files   # write session files
    46   CONFIG="${ALX_ICA_SESSIONS}/${ses_filename}"   CONFIG="${ALX_ICA_SESSIONS}/${ses_filename}"
    # Line 59  generate_ica_session_file() Line 67  generate_ica_session_file()
    67   addconfig "[${ses_session}]"   addconfig "[${ses_session}]"
    68   addconfig "Address=${ses_session}"   addconfig "Address=${ses_session}"
    69   addconfig "InitialProgram=#${ses_session}"   addconfig "InitialProgram=#${ses_session}"
    70    
    71     # convert to ica session file values
    72     case ${ses_colors} in
    73     24|32) ses_colors="8";;
    74     16) ses_colors="4";;
    75     8) ses_colors="2";;
    76     *) ses_colors="4";; # default to 16bit
    77     esac
    78     addconfig "DesiredColor=${ses_colors}"
    79   addconfig 'TransportDriver=TCP/IP'   addconfig 'TransportDriver=TCP/IP'
    80   addconfig 'WinStationDriver=ICA 3.0'   addconfig 'WinStationDriver=ICA 3.0'
    81   addconfig "ClearPassword=${ses__password}"   addconfig "ClearPassword=${ses_password}"
    82   addconfig "Username=${ses_username}"   addconfig "Username=${ses_username}"
    83   addconfig "Domain=${ses_domain}"   addconfig "Domain=${ses_domain}"
    84   addconfig 'UseFullScreen=Yes'   addconfig 'UseFullScreen=Yes'
    # Line 74  generate_program_sh() Line 91  generate_program_sh()
    91   local dest   local dest
    92   local name   local name
    93   local exec   local exec
    94     local param
    95   local workdir   local workdir
    96   local CONFIG   local CONFIG
    97    
    # Line 83  generate_program_sh() Line 101  generate_program_sh()
    101   case $1 in   case $1 in
    102   --name|-n) shift; name="$1" ;;   --name|-n) shift; name="$1" ;;
    103   --exec|-x) shift; exec="$1" ;;   --exec|-x) shift; exec="$1" ;;
    104     --param|-p) shift; param="$1" ;;
    105   --dest|-d) shift; dest="$1" ;;   --dest|-d) shift; dest="$1" ;;
    106   --workdir|-w) shift; workdir="$1" ;;   --workdir|-w) shift; workdir="$1" ;;
    107           esac           esac
    # Line 97  generate_program_sh() Line 116  generate_program_sh()
    116   CONFIG="${dest}"   CONFIG="${dest}"
    117   addconfig "#!/bin/sh"   addconfig "#!/bin/sh"
    118   [ -n "${workdir}" ] && addconfig "cd ${workdir}"   [ -n "${workdir}" ] && addconfig "cd ${workdir}"
    119   addconfig "exec ${exec}"   addconfig "exec ${exec} ${param}"
    120    
    121   chmod 0755 "${dest}"   chmod 0755 "${dest}"
    122  }  }
    # Line 115  generate_icon() Line 134  generate_icon()
    134   local iheight   local iheight
    135   local deficon   local deficon
    136   local CONFIG   local CONFIG
    137     local utility
    138    
    139   # very basic getops   # very basic getops
    140   for i in $*   for i in $*
    # Line 134  generate_icon() Line 154  generate_icon()
    154   done   done
    155    
    156   # some sanity checks:   # some sanity checks:
    157    
    158   # abort if name or command not given   # abort if name or command not given
    159   [[ -z ${name} ]] && return 1   [[ -z ${name} ]] && return 1
    160   [[ -z ${command} ]] && return 1   [[ -z ${command} ]] && return 1
    161    
    162     [[ -z ${dest} ]] && dest="${ALX_UNPRIV_HOME}/.idesktop/${name}.lnk"
    163    
    164   # use some defaults for icon, dest, {x,y}res   # use some defaults for icon, dest, {x,y}res
    165   [[ -z ${xres} ]] && xres=30   [[ -z ${xres} ]] && xres=50
    166   [[ -z ${yres} ]] && xres=30   [[ -z ${yres} ]] && xres=50
      [[ -z ${dest} ]] && dest="${ALX_UNPRIV_HOME}/.xtdesktop/${name}.lnk"  
    167   if [[ -z ${icon} ]] || [ ! -f ${icon} ]   if [[ -z ${icon} ]] || [ ! -f ${icon} ]
    168   then   then
    169   # if no default icon is given use default.png   # if no default icon is given use default.png
    # Line 150  generate_icon() Line 171  generate_icon()
    171   icon="${ALX_SESSIONS_ICONS}/${deficon}"   icon="${ALX_SESSIONS_ICONS}/${deficon}"
    172   fi   fi
    173    
    174   CONFIG=${dest}   CONFIG="${dest}"
    175   clearconfig   clearconfig
    176    
    177   addconfig 'table Icon'   addconfig 'table Icon'
      addconfig '  Type: Program'  
    178   addconfig "  Caption: ${name}"   addconfig "  Caption: ${name}"
    179   addconfig "  Command: ${command}"   addconfig "  Command: ${command}"
    180   addconfig "  Icon: ${icon}"   addconfig "  Icon: ${icon}"
    # Line 164  generate_icon() Line 184  generate_icon()
    184   # add these only if not zero   # add these only if not zero
    185   if [[ ! -z ${iwidth} ]] && [[ ! -z ${iheight} ]]   if [[ ! -z ${iwidth} ]] && [[ ! -z ${iheight} ]]
    186   then   then
    187   addconfig "  IconWidth: ${iwidth}"   addconfig "  Width: ${iwidth}"
    188   addconfig "  IconHeight: ${iheight}"   addconfig "  Height: ${iheight}"
    189   fi   fi
    190    
    191   addconfig 'end'   addconfig 'end'
    # Line 175  generate_all_desktop_icons() Line 195  generate_all_desktop_icons()
    195  {  {
    196   local session_list="$1"   local session_list="$1"
    197   local other_menuitem_list="$2"   local other_menuitem_list="$2"
    198     local plugin_list="$3"
    199   local res   local res
    200   local xres   local xres
    201   local yres   local yres
    202   local x   local x
    203   local y   local y
    204   local item   local i
    205   local name   local name
    206   local progsh_path   local progsh_path
    207     local utility
    208     local dest
    209     local rc
    210    
    211     dest="${ALX_UNPRIV_HOME}/.idesktop"
    212     rc="${ALX_UNPRIV_HOME}/.ideskrc"
    213    
    214   # progsh path   # progsh path
    215   progsh_path=${ALX_UNPRIV_HOME}/.alxprogs   progsh_path="${ALX_UNPRIV_HOME}/.alxprogs"
    216    
    217   # get the resolution   # get the resolution
    218   res=$(mysqldo "select resolution from cfg_graphic where serial='${ALX_SERIAL}'")   res=$(mysqldo "select resolution from cfg_graphic where serial='${ALX_SERIAL}'")
    219    
    220   # split res to x & y   # split res to x & y
    221   xres="${res%x*}"   xres="${res%x*}"
    222   xres="${res#*x}"   yres="${res#*x}"
    223    
    224   # top left edge of the icon is given in config file   # top left edge of the icon is given in config file
    225   # remove a little bit to simulate the bottom-right edge   # remove a little bit to simulate the bottom-right edge
    226   xres="$(( ${xres} - 120 ))"   xres="$(( ${xres} - 120 ))"
    227   yres="$(( ${yres} - 80 ))"   yres="$(( ${yres} - 80 ))"
    228    
      # basic config  
      cat ${ALX_SKELETONS}/xtdesktop/xtdeskrc > ${ALX_UNPRIV_HOME}/.xtdeskrc  
       
    229   # clean desktop icon location   # clean desktop icon location
    230   [ -d ${ALX_UNPRIV_HOME}/.xtdesktop ] && rm -rf ${ALX_UNPRIV_HOME}/.xtdesktop   [ -d ${dest} ] && rm -rf ${dest}
    231   install -d ${ALX_UNPRIV_HOME}/.xtdesktop   [ -f ${rc} ] && rm -f ${rc}
    232     install -d ${dest}
    233    
    234   # default settings   # default settings
    235   declare -i x=30   declare -i x=50
    236   declare -i y=30   declare -i y=50
    237    
    238   # ica icons   # ica icons
    239   for item in ${session_list}   for i in ${session_list}
    240   do   do
    241   # abort if empty   # abort if empty
    242   [[ -z ${item} ]] && continue   [[ -z ${i} ]] && continue
    243    
    244     # get database information
    245     evaluate_table cfg_sessions "where serial='${ALX_SERIAL}' and id='${i}'"
    246    
    247   # new line if x > xres   # new line if x > xres
    248   if [ ${x} -ge ${xres} ]   if [ ${x} -ge ${xres} ]
    249   then   then
    250   x=30   x=50
    251   y=$((${y} + 80))   y=$((${y} + 80))
    252   fi   fi
    253    
    # Line 227  generate_all_desktop_icons() Line 255  generate_all_desktop_icons()
    255   if [ ${y} -ge ${yres} ]   if [ ${y} -ge ${yres} ]
    256   then   then
    257   x=$((${x} + 120))   x=$((${x} + 120))
    258   y=30   y=50
    259    
    260   # re-check x   # re-check x
    261   [ ${x} -ge ${xres} ] && x=30   [ ${x} -ge ${xres} ] && x=50
    262   fi   fi
    263    
      name="$(basename ${item} .ica)"  
    264   generate_icon \   generate_icon \
    265   --name "${name}" \   --name "${cfg_sessions_session}" \
    266   --command "nice -n 19 wfica ${ALX_ICA_SESSIONS}/${item}" \   --command "nice -n 19 wfica ${ALX_ICA_SESSIONS}/$(fix_whitespaces ${cfg_sessions_filename})" \
    267   --icon "${ALX_SESSIONS_ICONS}/${name}.png" \   --icon "${ALX_SESSIONS_ICONS}/$(fix_whitespaces ${cfg_sessions_session}).png" \
    268   --dest "${ALX_UNPRIV_HOME}/.xtdesktop/${name}.lnk" \   --dest "${dest}/$(fix_whitespaces ${cfg_sessions_session}).lnk" \
    269   --xres "${x}" \   --xres "${x}" \
    270   --yres "${y}"   --yres "${y}"
    271    
    272   y=$((${y} + 80))   y=$((${y} + 80))
    273   done   done
    274    
    275   for item in ${other_menuitem_list}   for i in ${other_menuitem_list}
    276   do   do
    277   # abort if empty   # abort if empty
    278   [[ -z ${item} ]] && continue   [[ -z ${i} ]] && continue
    279    
    280     # get database information
    281     evaluate_table cfg_other_menuitems "where serial='${ALX_SERIAL}' and id='${i}'"
    282    
    283   # new line if x > xres   # new line if x > xres
    284   if [ ${x} -ge ${xres} ]   if [ ${x} -ge ${xres} ]
    285   then   then
    286   x=30   x=50
    287   y=$((${y} + 80))   y=$((${y} + 80))
    288   fi   fi
    289    
    # Line 261  generate_all_desktop_icons() Line 291  generate_all_desktop_icons()
    291   if [ ${y} -ge ${yres} ]   if [ ${y} -ge ${yres} ]
    292   then   then
    293   x=$((${x} + 120))   x=$((${x} + 120))
    294   y=30   y=50
    295    
    296   # re-check x   # re-check x
    297   [ ${x} -ge ${xres} ] && x=30   [ ${x} -ge ${xres} ] && x=50
    298   fi   fi
    299    
    300   generate_icon \   generate_icon \
    301   --name "${item}" \   --name "${cfg_other_menuitems_name}" \
    302   --command "${progsh_path}/${item}" \   --command "${progsh_path}/$(fix_whitespaces ${cfg_other_menuitems_name})" \
    303   --icon "${ALX_SESSIONS_ICONS}/${item}.png" \   --icon "${ALX_SESSIONS_ICONS}/$(fix_whitespaces ${cfg_other_menuitems_name}).png" \
    304   --dest "${ALX_UNPRIV_HOME}/.xtdesktop/${item}.lnk" \   --dest "${dest}/$(fix_whitespaces ${cfg_other_menuitems_name}).lnk" \
    305   --xres "${x}" \   --xres "${x}" \
    306   --yres "${y}" \   --yres "${y}" \
    307   --default-icon "default_item.png"   --default-icon "default_item.png"
    308    
    309   y=$((${y} + 80))   y=$((${y} + 80))
    310   done   done
    311    
    312     for i in ${plugin_list}
    313     do
    314     # abort if empty
    315     [[ -z ${i} ]] && continue
    316    
    317     evaluate_table cfg_plugins "where serial='${ALX_SERIAL}' and id='${i}'"
    318     if [[ -x ${ALX_PLUGINS}/${cfg_plugins_plugin}/plugin.sh ]]
    319     then
    320     eval $(${ALX_PLUGINS}/${cfg_plugins_plugin}/plugin.sh menuitem)
    321    
    322     # abort if name or exec is empty
    323     [[ -z ${PLUGIN_MENUITEM_NAME} ]] && continue
    324     [[ -z ${PLUGIN_MENUITEM_EXEC} ]] && continue
    325    
    326     # new line if x > xres
    327     if [ ${x} -ge ${xres} ]
    328     then
    329     x=50
    330     y=$((${y} + 80))
    331     fi
    332    
    333     # new row if y > yres
    334     if [ ${y} -ge ${yres} ]
    335     then
    336     x=$((${x} + 120))
    337     y=50
    338    
    339     # re-check x
    340     [ ${x} -ge ${xres} ] && x=50
    341     fi
    342    
    343     generate_icon \
    344     --name "${PLUGIN_MENUITEM_NAME}" \
    345     --command "${progsh_path}/$(fix_whitespaces ${PLUGIN_MENUITEM_NAME})" \
    346     --icon "${ALX_SESSIONS_ICONS}/$(fix_whitespaces ${PLUGIN_MENUITEM_NAME}).png" \
    347     --dest "${dest}/$(fix_whitespaces ${PLUGIN_MENUITEM_NAME}).lnk" \
    348     --xres "${x}" \
    349     --yres "${y}" \
    350     --default-icon "default_item.png"
    351    
    352     y=$((${y} + 80))
    353     fi
    354    
    355     # unset all variables
    356     unset PLUGIN_MENUITEM_NAME
    357     unset PLUGIN_MENUITEM_EXEC
    358     unset PLUGIN_MENUITEM_PARAM
    359     unset PLUGIN_MENUITEM_WORKDIR
    360     unset PLUGIN_MENUITEM_ICON
    361     done
    362    
    363     # add shutdown, reboot icons
    364     for i in shutdown reboot
    365     do
    366     # new line if x > xres
    367     if [ ${x} -ge ${xres} ]
    368     then
    369     x=50
    370     y=$((${y} + 80))
    371     fi
    372    
    373     # new row if y > yres
    374     if [ ${y} -ge ${yres} ]
    375     then
    376     x=$((${x} + 120))
    377     y=50
    378    
    379     # re-check x
    380     [ ${x} -ge ${xres} ] && x=50
    381     fi
    382    
    383     case ${i} in
    384     shutdown) name="Herunterfahren" ;;
    385     reboot) name="Neustarten" ;;
    386     esac
    387    
    388     generate_icon \
    389     --name "${name}" \
    390     --command "/usr/lib/alxconfig-ng/bin/user_${i}.sh" \
    391     --icon "${ALX_SESSIONS_ICONS}/${i}.png" \
    392     --dest "${dest}/${i}.lnk" \
    393     --xres "${x}" \
    394     --yres "${y}" \
    395     --icon-width "40" \
    396     --icon-height "40"
    397    
    398     y=$((${y} + 80))
    399     done
    400    
    401   # last but not least gen a icon with some sys informations   # last but not least gen a icon with some sys informations
    402   local sysinfo   local sysinfo
    # Line 301  generate_all_desktop_icons() Line 420  generate_all_desktop_icons()
    420   --name "${sysinfo}" \   --name "${sysinfo}" \
    421   --command "exit 0" \   --command "exit 0" \
    422   --icon "${ALX_SESSIONS_ICONS}/sysinfo.png" \   --icon "${ALX_SESSIONS_ICONS}/sysinfo.png" \
    423   --dest "${ALX_UNPRIV_HOME}/.xtdesktop/sysinfo.lnk" \   --dest "${dest}/sysinfo.lnk" \
    424   --xres "${xres}" \   --xres "${xres}" \
    425   --yres "${yres}" \   --yres "${yres}" \
    426   --icon-width "1" \   --icon-width "1" \
    # Line 315  config_sessions() Line 434  config_sessions()
    434   local all_other_ids   local all_other_ids
    435   local CONFIG   local CONFIG
    436   local screensaver_passwd_cmd   local screensaver_passwd_cmd
    437   local all_sessions   local fbinit
    438   local all_other_menuitems   local fbkeys
    439    
    440   # get all session ids from database   # get all session ids from database
    441   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}'")
    442   # get all other_menutiem ids from database   # get all other_menuitem ids from database
    443   all_other_ids=$(mysqldo "select id from cfg_other_menuitems where serial='${ALX_SERIAL}'")   all_other_ids=$(mysqldo "select id from cfg_other_menuitems where serial='${ALX_SERIAL}'")
    444     # get all plugin ids from database
    445     all_plugin_ids=$(mysqldo "select id from cfg_plugins where serial='${ALX_SERIAL}'")
    446    
    447   # get screensaver settings   # get screensaver settings
    448   evaluate_table cfg_screensaver   evaluate_table cfg_screensaver
    449   # get autostart settings   # get autostart settings
    450   evaluate_table cfg_autostart   evaluate_table cfg_autostart
    451     # get current color depth
    452     evaluate_table cfg_graphic
    453    
    454   # now setup fluxbox for user station   # now setup fluxbox for user station
    455    
    # Line 337  config_sessions() Line 460  config_sessions()
    460   # now generate fluxbox config files   # now generate fluxbox config files
    461    
    462   # fluxbox main config   # fluxbox main config
    463   cat ${ALX_SKELETONS}/fluxbox/init > ${ALX_UNPRIV_HOME}/.fluxbox/init   if [ -f ${ALX_SKELETONS}/fluxbox/init ]
    464     then
    465     fbinit="${ALX_SKELETONS}/fluxbox/init"
    466     else
    467     fbinit="/usr/share/fluxbox/init"
    468     fi
    469     cat ${fbinit} > ${ALX_UNPRIV_HOME}/.fluxbox/init
    470    
    471   # fluxbox autostart   # fluxbox autostart
      cat ${ALX_SKELETONS}/fluxbox/apps > ${ALX_UNPRIV_HOME}/.fluxbox/apps  
       
    472   CONFIG="${ALX_UNPRIV_HOME}/.fluxbox/apps"   CONFIG="${ALX_UNPRIV_HOME}/.fluxbox/apps"
    473     # do not show decorations on messages generated with xmessage
    474     if [ -x /usr/bin/xmessage ]
    475     then
    476     addconfig '[app] (xmessage)'
    477     addconfig ' [Deco] {NONE}'
    478     addconfig '[end]'
    479     fi
    480     # add icon utility
    481     [ -x /usr/bin/idesk ] && addconfig '[startup] {nohup idesk > /dev/null &}'
    482     # add numlock utility
    483     [ -x /usr/bin/numlockx ] && addconfig '[startup] {nohup numlockx on &}'
    484    
    485   # add screensaver   # add screensaver
    486   if [[ ! -z ${cfg_screensaver_screensaver} ]] && [[ ! -z ${cfg_screensaver_screensaver_timeout} ]]   if [[ ! -z ${cfg_screensaver_screensaver} ]] && [[ ! -z ${cfg_screensaver_screensaver_timeout} ]]
    487   then   then
    # Line 359  config_sessions() Line 498  config_sessions()
    498   # add autostart session   # add autostart session
    499   if [[ ! -z ${cfg_autostart_session} ]]   if [[ ! -z ${cfg_autostart_session} ]]
    500   then   then
    501   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
    502     addconfig "[startup] {sleep 1 && nohup nice -n 19 wfica ${ALX_ICA_SESSIONS}/$(fix_whitespaces ${cfg_autostart_session}) &}"
    503   fi   fi
    504    
    505   # fluxbox hotkeys   # fluxbox hotkeys
    506   cat ${ALX_SKELETONS}/fluxbox/keys > ${ALX_UNPRIV_HOME}/.fluxbox/keys   if [ -f ${ALX_SKELETONS}/fluxbox/keys ]
    507     then
    508     fbkeys="${ALX_SKELETONS}/fluxbox/keys"
    509     else
    510     fbkeys="/usr/share/fluxbox/keys"
    511     fi
    512     cat ${fbkeys} > ${ALX_UNPRIV_HOME}/.fluxbox/keys
    513    
    514   # generate a fluxbox menu   # generate a fluxbox menu
    515   CONFIG=${ALX_UNPRIV_HOME}/.fluxbox/menu   CONFIG="${ALX_UNPRIV_HOME}/.fluxbox/menu"
    516   clearconfig   clearconfig
    517    
    518   # fluxbox menu header   # fluxbox menu header
    # Line 383  config_sessions() Line 529  config_sessions()
    529   evaluate_table cfg_sessions "where serial='${ALX_SERIAL}' and id='${i}'"   evaluate_table cfg_sessions "where serial='${ALX_SERIAL}' and id='${i}'"
    530   generate_ica_session_file \   generate_ica_session_file \
    531   --session "${cfg_sessions_session}" \   --session "${cfg_sessions_session}" \
    532   --filename "${cfg_sessions_filename}" \   --filename "$(fix_whitespaces ${cfg_sessions_filename})" \
    533   --username "${cfg_sessions_username}" \   --username "${cfg_sessions_username}" \
    534   --password "${cfg_sessions_password}" \   --password "${cfg_sessions_password}" \
    535   --domain "${cfg_sessions_domain}" \   --domain "${cfg_sessions_domain}" \
    536   --server "${cfg_sessions_browseradrs}"   --server "${cfg_sessions_browseradrs}" \
    537     --colordepth "${cfg_graphic_depth}"
    538    
    539   # fluxbox menusession   # fluxbox menusession
    540   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}"  
    541   done   done
    542    
    543   # delete all progs   # delete all progs
    # Line 421  config_sessions() Line 565  config_sessions()
    565   generate_program_sh \   generate_program_sh \
    566   --name "${cfg_other_menuitems_name}" \   --name "${cfg_other_menuitems_name}" \
    567   --exec "${cfg_other_menuitems_exec}" \   --exec "${cfg_other_menuitems_exec}" \
    568   --dest "${progsh_path}/${cfg_other_menuitems_name}" \   --param "${cfg_other_menuitems_param}" \
    569   "${cfg_other_menuitems_workdir}"   --dest "${progsh_path}/$(fix_whitespaces ${cfg_other_menuitems_name})" \
    570     "${workdir}"
    571    
    572     addconfig "[exec] (${cfg_other_menuitems_name}) {${progsh_path}/$(fix_whitespaces ${cfg_other_menuitems_name})} ${cfg_other_menuitems_icon}"
    573     done
    574    
    575     # add plugins
    576     for i in ${all_plugin_ids}
    577     do
    578     evaluate_table cfg_plugins "where serial='${ALX_SERIAL}' and id='${i}'"
    579     if [[ -x ${ALX_PLUGINS}/${cfg_plugins_plugin}/plugin.sh ]]
    580     then
    581     eval $(${ALX_PLUGINS}/${cfg_plugins_plugin}/plugin.sh menuitem)
    582    
    583   addconfig "[exec] (${cfg_other_menuitems_name}) {${progsh_path}/${cfg_other_menuitems_name}} ${cfg_other_menuitems_icon}"   # abort if name or exec is empty
    584     [[ -z ${PLUGIN_MENUITEM_NAME} ]] && continue
    585     [[ -z ${PLUGIN_MENUITEM_EXEC} ]] && continue
    586    
    587     # now echo config line for fluxbox-menu
    588     # make it "configureable" :p
    589     if [[ -n ${PLUGIN_MENUITEM_WORKDIR} ]]
    590     then
    591     workdir="--workdir ${PLUGIN_MENUITEM_WORKDIR}"
    592     fi
    593     if [[ -n ${PLUGIN_MENUITEM_ICON} ]]
    594     then
    595     PLUGIN_MENUITEM_ICON="<${PLUGIN_MENUITEM_ICON}>"
    596     fi
    597    
    598     # gen prog startup wrapper
    599     generate_program_sh \
    600     --name "${PLUGIN_MENUITEM_NAME}" \
    601     --exec "${PLUGIN_MENUITEM_EXEC}" \
    602     --param "${PLUGIN_MENUITEM_PARAM}" \
    603     --dest "${progsh_path}/$(fix_whitespaces ${PLUGIN_MENUITEM_NAME})" \
    604     "${workdir}"
    605    
    606     addconfig "[exec] (${PLUGIN_MENUITEM_NAME}) {${progsh_path}/$(fix_whitespaces ${PLUGIN_MENUITEM_NAME})} ${PLUGIN_MENUITEM_ICON}"
    607     fi
    608    
    609   # add to all_other_menuitems variable to create icons later for these   # unset all variables
    610   all_other_menuitems="${all_other_menuitems} ${cfg_other_menuitems_name}"   unset PLUGIN_MENUITEM_NAME
    611     unset PLUGIN_MENUITEM_EXEC
    612     unset PLUGIN_MENUITEM_PARAM
    613     unset PLUGIN_MENUITEM_WORKDIR
    614     unset PLUGIN_MENUITEM_ICON
    615   done   done
    616    
    617   # fluxbox menu footer   # fluxbox menu footer
    # Line 436  config_sessions() Line 620  config_sessions()
    620   addconfig   addconfig
    621    
    622   # now it's a good time to generate *all* icons :)   # now it's a good time to generate *all* icons :)
    623   generate_all_desktop_icons "${all_sessions}" "${all_other_menuitems}"   generate_all_desktop_icons "${all_ses_ids}" "${all_other_ids}" "${all_plugin_ids}"
    624    
    625   # fix permissions   # fix permissions
    626   chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}   chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}
    627   chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}/.fluxbox   chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}/.fluxbox
    628   chmod 0755 ${ALX_UNPRIV_HOME}/.fluxbox   chmod 0755 ${ALX_UNPRIV_HOME}/.fluxbox
    629   chmod 0755 ${ALX_UNPRIV_HOME}/.xtdesktop   chmod 0755 ${ALX_UNPRIV_HOME}/.idesktop
      chmod 0644 ${ALX_UNPRIV_HOME}/.xtdeskrc  
    630  }  }
    Legend:
    Removed from v.2149  
    changed lines
      Added in v.3455