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 2035 by niro, Wed May 11 09:11:02 2011 UTC revision 2435 by niro, Thu Jun 16 16:21:11 2011 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  get_sessions_settings()  fix_whitespaces()
    5  {  {
    6   local x i all count   local var="$@"
    7     echo "${var//\ /_}"
      # all arrays:  
      # ->  session1 session2 ... sessionN  
       
      # get settings from database  
      all=$(mysqldo "select filename from cfg_sessions where serial='${ALX_SERIAL}'")  
       
      # split'em up and put in an array (only if $all not zero)  
      declare -i i=0  
      if [ -n "${all}" ]  
      then  
      for x in ${all}  
      do  
      ALX_SESSIONS[${i}]=${x}  
      ((i++))  
      done  
      count=${i}  
      else  
      count=0  
      fi  
       
      # get settings from database  
      ALX_PROGRAMS=$(mysqldo "select name from cfg_other_menuitems where serial='${ALX_SERIAL}'")  
       
      export ALX_SESSIONS  
      export ALX_PROGRAMS  
     }  
       
     get_autostart_settings()  
     {  
      # get settings from database  
      ALX_AUTOSTART=$(mysqldo "select session from cfg_autostart where serial='${ALX_SERIAL}'")  
       
      export ALX_AUTOSTART  
     }  
       
     get_screensaver_settings()  
     {  
      ALX_SCRN_SAVER=$(mysqldo "select screensaver from cfg_screensaver where serial='${ALX_SERIAL}'")  
      ALX_SCRN_TIMEOUT=$(mysqldo "select timeout from cfg_screensaver where serial='${ALX_SERIAL}'")  
      ALX_SCRN_PASSWD=$(mysqldo "select password from cfg_screensaver where serial='${ALX_SERIAL}'")  
       
      export ALX_SCRN_SAVER  
      export ALX_SCRN_TIMEOUT  
      export ALX_SCRN_PASSWD  
    8  }  }
    9    
    10  generate_ica_session_files()  # helper function to create citrix session files
    11    generate_ica_session_file()
    12  {  {
      local all_ids  
    13   local i   local i
    14   local x   local num
      local browser_address_num  
    15   local server   local server
    16   local ses_session   local ses_session
    17   local ses_filename   local ses_filename
    # Line 67  generate_ica_session_files() Line 22  generate_ica_session_files()
    22   local ses_colors   local ses_colors
    23   local CONFIG   local CONFIG
    24    
    25   # get settings from database   # very basic getops
    26   all_ids=$(mysqldo "select id from cfg_sessions where serial='${ALX_SERIAL}'")   for i in $*
    27     do
    28     case $1 in
    29     --session) shift; ses_session="$1" ;;
    30     --filename) shift; ses_filename="$1" ;;
    31     --username) shift; ses_username="$1" ;;
    32     --password) shift; ses_password="$1" ;;
    33     --domain) shift; ses_domain="$1" ;;
    34     --server) shift; ses_browseradrs="$1" ;;
    35     --colordepth) shift; ses_colors="$1" ;;
    36             esac
    37     shift
    38     done
    39    
    40     # abort if session, filename or server not given
    41     [[ -z ${ses_session} ]] && return 1
    42     [[ -z ${ses_filename} ]] && return 1
    43     [[ -z ${ses_browseradrs} ]] && return 1
    44    
    45     # write session files
    46     CONFIG="${ALX_ICA_SESSIONS}/${ses_filename}"
    47     clearconfig
    48    
    49     addconfig '[WFClient]'
    50     addconfig 'Version=2'
    51    
    52   for i in ${all_ids}   # use ';' as ifs
    53     declare -i i=0
    54     for server in ${ses_browseradrs//;/ }
    55   do   do
    56   # get settings   (( i++ ))
    57   ses_session=$(mysqldo "select session from cfg_sessions where serial='${ALX_SERIAL}' and id='${i}'")   num="${i}"
    58   ses_filename=$(mysqldo "select filename from cfg_sessions where serial='${ALX_SERIAL}' and id='${i}'")   # support newer ica-clients:
    59   ses_username=$(mysqldo "select username from cfg_sessions where serial='${ALX_SERIAL}' and id='${i}'")   # the first address must be named TcpBrowserAddress, but not TcpBrowserAddress1 !!
    60   ses_domain=$(mysqldo "select domain from cfg_sessions where serial='${ALX_SERIAL}' and id='${i}'")   [[ ${i} -eq 1 ]] && num=""
    61   ses_password=$(mysqldo "select password from cfg_sessions where serial='${ALX_SERIAL}' and id='${i}'")   addconfig "TcpBrowserAddress${num}=${server}"
      ses_browseradrs=$(mysqldo "select browseradrs from cfg_sessions where serial='${ALX_SERIAL}' and id='${i}'")  
       
      # get the right colors  
      ses_colors=$(mysqldo "select depth from cfg_graphic where serial='${ALX_SERIAL}'")  
      # convert to ica session file values  
      case ${ses_colors} in  
      24) ses_colors="8";;  
      16) ses_colors="4";;  
      8) ses_colors="2";;  
      *) ses_colors="2";;  
      esac  
       
      # write session files  
      CONFIG=${ALX_ICA_SESSIONS}/${ses_filename}  
      clearconfig  
       
      addconfig '[WFClient]'  
      addconfig 'Version=2'  
      OLD_IFS="$IFS"  
      IFS=";"  
      declare -i x=0  
      for server in ${ses_browseradrs}  
      do  
      (( x++ ))  
      browser_address_num="${x}"  
      # support newer ica-clients:  
      # the first address must be named TcpBrowserAddress, but not TcpBrowserAddress1 !!  
      [[ ${x} -eq 1 ]] && browser_address_num=""  
      addconfig "TcpBrowserAddress${browser_address_num}=${server}"  
      done  
      IFS="${OLD_IFS}"  
      unset x  
      unset OLD_IFS  
       
      addconfig 'ScreenPercent=0'  
      addconfig '[ApplicationServers]'  
      addconfig "${ses_session}="  
      addconfig "[${ses_session}]"  
      addconfig "Address=${ses_session}"  
      addconfig "InitialProgram=#${ses_session}"  
      addconfig "DesiredColor=${ses_colors}"  
      addconfig 'TransportDriver=TCP/IP'  
      addconfig 'WinStationDriver=ICA 3.0'  
      addconfig "ClearPassword=${ses_password}"  
      addconfig "Username=${ses_username}"  
      addconfig "Domain=${ses_domain}"  
      addconfig 'UseFullScreen=Yes'  
      addconfig 'NoWindowManager=True'  
    62   done   done
    63    
    64     addconfig 'ScreenPercent=0'
    65     addconfig '[ApplicationServers]'
    66     addconfig "${ses_session}="
    67     addconfig "[${ses_session}]"
    68     addconfig "Address=${ses_session}"
    69     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'
    80     addconfig 'WinStationDriver=ICA 3.0'
    81     addconfig "ClearPassword=${ses__password}"
    82     addconfig "Username=${ses_username}"
    83     addconfig "Domain=${ses_domain}"
    84     addconfig 'UseFullScreen=Yes'
    85     addconfig 'NoWindowManager=True'
    86  }  }
    87    
    88  # generates a sh file to start programs  # generates a sh file to start programs
    # Line 135  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 144  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 151  generate_program_sh() Line 109  generate_program_sh()
    109   done   done
    110    
    111   # abort if name, dest or exec not given   # abort if name, dest or exec not given
    112   [ -z "${name}" ] && return 1   [[ -z ${name} ]] && return 1
    113   [ -z "${exec}" ] && return 1   [[ -z ${exec} ]] && return 1
    114   [ -z "${dest}" ] && return 1   [[ -z ${dest} ]] && return 1
    115    
    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}"
     }  
       
     get_other_menuitems()  
     {  
      local x i progsh_path name exec icon workdir  
       
      # all arrays:  
      # ->  session1 session2 ... sessionN  
       
      # get settings from database -> now stored in ALX_PROGRAMS  
       
      # abort if empty  
      [ -z "${ALX_PROGRAMS}" ] && return 0  
       
      progsh_path=${ALX_UNPRIV_HOME}/.alxprogs  
      [ -d ${progsh_path} ] && rm -rf ${progsh_path}  
      install -d ${progsh_path}  
       
      # gen menu items  
      for x in ${ALX_PROGRAMS}  
      do  
      # to be sure  
      unset name  
      unset exec  
      unset workdir  
      unset icon  
       
      name=$(mysqldo "select name from cfg_other_menuitems where serial='${ALX_SERIAL}' and name='${x}'")  
      exec=$(mysqldo "select exec from cfg_other_menuitems where serial='${ALX_SERIAL}' and name='${x}'")  
      workdir=$(mysqldo "select workdir from cfg_other_menuitems where serial='${ALX_SERIAL}' and name='${x}'")  
      icon=$(mysqldo "select icon from cfg_other_menuitems where serial='${ALX_SERIAL}' and name='${x}'")  
       
      # now echo config line for fluxbox-menu  
      # make it "configureable" :P  
      [ -n "${workdir}" ] && workdir="--workdir ${workdir}"  
      [ -n "${icon}" ] && icon="<${icon}>"  
       
      # gen prog startup wrapper  
      generate_program_sh \  
      --name "${name}" \  
      --exec "${exec}" \  
      --dest "${progsh_path}/${name}" \  
      "${workdir}"  
       
      echo "[exec] (${name}) {${progsh_path}/${name}} ${icon}"  
      done  
    122  }  }
    123    
    124  # helper functions for generate all desktop icons  # helper functions for generate all desktop icons
    # Line 222  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 240  generate_icon() Line 153  generate_icon()
    153   shift   shift
    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     # which utility are we using idesk|xtdesk ?
    163     if [ -x /usr/bin/idesk ]
    164     then
    165     utility="idesk"
    166     [[ -z ${dest} ]] && dest="${ALX_UNPRIV_HOME}/.idesktop/${name}.lnk"
    167     else
    168     utility="xtdesk"
    169     [[ -z ${dest} ]] && dest="${ALX_UNPRIV_HOME}/.xtdesktop/${name}.lnk"
    170     fi
    171    
    172   # use some defaults for icon, dest, {x,y}res   # use some defaults for icon, dest, {x,y}res
    173   [[ -z ${xres} ]] && xres=30   [[ -z ${xres} ]] && xres=30
    174   [[ -z ${yres} ]] && xres=30   [[ -z ${yres} ]] && xres=30
      [[ -z ${dest} ]] && dest="${ALX_UNPRIV_HOME}/.xtdesktop/${name}.lnk"  
    175   if [[ -z ${icon} ]] || [ ! -f ${icon} ]   if [[ -z ${icon} ]] || [ ! -f ${icon} ]
    176   then   then
    177   # if no default icon is given use default.png   # if no default icon is given use default.png
    # Line 257  generate_icon() Line 179  generate_icon()
    179   icon="${ALX_SESSIONS_ICONS}/${deficon}"   icon="${ALX_SESSIONS_ICONS}/${deficon}"
    180   fi   fi
    181    
    182   CONFIG=${dest}   CONFIG="${dest}"
    183   clearconfig   clearconfig
    184    
    185   addconfig 'table Icon'   addconfig 'table Icon'
    186   addconfig '  Type: Program'   [[ ${utility} = xtdesk ]] && addconfig '  Type: Program'
    187   addconfig "  Caption: ${name}"   addconfig "  Caption: ${name}"
    188   addconfig "  Command: ${command}"   addconfig "  Command: ${command}"
    189   addconfig "  Icon: ${icon}"   addconfig "  Icon: ${icon}"
    # Line 271  generate_icon() Line 193  generate_icon()
    193   # add these only if not zero   # add these only if not zero
    194   if [[ ! -z ${iwidth} ]] && [[ ! -z ${iheight} ]]   if [[ ! -z ${iwidth} ]] && [[ ! -z ${iheight} ]]
    195   then   then
    196   addconfig "  IconWidth: ${iwidth}"   if [[ ${utility} = xtdesk ]]
    197   addconfig "  IconHeight: ${iheight}"   then
    198     addconfig "  IconWidth: ${iwidth}"
    199     addconfig "  IconHeight: ${iheight}"
    200     fi
    201     if [[ ${utility} = idesk ]]
    202     then
    203     addconfig "  Width: ${iwidth}"
    204     addconfig "  Height: ${iheight}"
    205     fi
    206   fi   fi
    207    
    208   addconfig 'end'   addconfig 'end'
    # Line 280  generate_icon() Line 210  generate_icon()
    210    
    211  generate_all_desktop_icons()  generate_all_desktop_icons()
    212  {  {
    213     local session_list="$1"
    214     local other_menuitem_list="$2"
    215   local res   local res
    216   local xres   local xres
    217   local yres   local yres
      local icon_list  
    218   local x   local x
    219   local y   local y
    220   local item   local i
    221   local basename_item   local name
    222   local progsh_path   local progsh_path
    223     local utility
    224     local dest
    225     local rc
    226    
    227     # which utility are we using idesk|xtdesk ?
    228     if [ -x /usr/bin/idesk ]
    229     then
    230     utility="idesk"
    231     dest="${ALX_UNPRIV_HOME}/.idesktop"
    232     rc="${ALX_UNPRIV_HOME}/.ideskrc"
    233     else
    234     utility="xtdesk"
    235     dest="${ALX_UNPRIV_HOME}/.xtdesktop"
    236     rc="${ALX_UNPRIV_HOME}/.xtdeskrc"
    237     fi
    238    
    239    
    240     # progsh path
    241     progsh_path="${ALX_UNPRIV_HOME}/.alxprogs"
    242    
    243   # get the resolution   # get the resolution
    244   res=$(mysqldo "select resolution from cfg_graphic where serial='${ALX_SERIAL}'")   res=$(mysqldo "select resolution from cfg_graphic where serial='${ALX_SERIAL}'")
    245    
    246   # split res to x & y   # split res to x & y
    247   xres="$(echo ${res} | cut -dx -f1)"   xres="${res%x*}"
    248   yres="$(echo ${res} | cut -dx -f2)"   yres="${res#*x}"
    249    
    250   # top left edge of the icon is given in config file   # top left edge of the icon is given in config file
    251   # remove a little bit to simulate the bottom-right edge   # remove a little bit to simulate the bottom-right edge
    252   xres="$(( ${xres} - 120 ))"   xres="$(( ${xres} - 120 ))"
    253   yres="$(( ${yres} - 80 ))"   yres="$(( ${yres} - 80 ))"
    254    
      # basic config  
      cat ${ALX_SKELETONS}/xtdesktop/xtdeskrc > ${ALX_UNPRIV_HOME}/.xtdeskrc  
       
    255   # clean desktop icon location   # clean desktop icon location
    256   [ -d ${ALX_UNPRIV_HOME}/.xtdesktop ] && rm -rf ${ALX_UNPRIV_HOME}/.xtdesktop   [ -d ${dest} ] && rm -rf ${dest}
    257   install -d ${ALX_UNPRIV_HOME}/.xtdesktop   [ -f ${rc} ] && rm -f ${rc}
    258     install -d ${dest}
    259    
    260    if [[ ${utility} = xtdesk ]]
    261    then
    262     # basic config
    263     cat ${ALX_SKELETONS}/xtdesktop/xtdeskrc > ${ALX_UNPRIV_HOME}/.xtdesktop/xtdeskrc
    264    fi
    265    
    266   # default settings   # default settings
    267   declare -i x=30   declare -i x=30
    268   declare -i y=30   declare -i y=30
    269    
    270   # first all ica sessions   # ica icons
    271   local count=${#ALX_SESSIONS[*]}   for i in ${session_list}
      for (( i=0; i < count; i++ ))  
      do  
      # filenames !  
      icon_list="${icon_list} ${ALX_SESSIONS[${i}]}"  
      done  
       
      for item in ${icon_list}  
    272   do   do
    273   # abort if empty   # abort if empty
    274   [[ -z ${item} ]] && continue   [[ -z ${i} ]] && continue
    275    
    276     # get database information
    277     evaluate_table cfg_sessions "where serial='${ALX_SERIAL}' and id='${i}'"
    278    
    279   # new line if x > xres   # new line if x > xres
    280   if [ ${x} -ge ${xres} ]   if [ ${x} -ge ${xres} ]
    # Line 344  generate_all_desktop_icons() Line 293  generate_all_desktop_icons()
    293   [ ${x} -ge ${xres} ] && x=30   [ ${x} -ge ${xres} ] && x=30
    294   fi   fi
    295    
      # ica icons  
      # get basename (.ica must be suffix)  
      basename_item="$(basename ${item} .ica)"  
    296   generate_icon \   generate_icon \
    297   --name "${basename_item}" \   --name "${cfg_sessions_session}" \
    298   --command "nice -n 19 wfica ${ALX_ICA_SESSIONS}/${item}" \   --command "nice -n 19 wfica ${ALX_ICA_SESSIONS}/$(fix_whitespaces ${cfg_sessions_filename})" \
    299   --icon "${ALX_SESSIONS_ICONS}/${basename_item}.png" \   --icon "${ALX_SESSIONS_ICONS}/$(fix_whitespaces ${cfg_sessions_session}).png" \
    300   --dest "${ALX_UNPRIV_HOME}/.xtdesktop/${basename_item}.lnk" \   --dest "${dest}/$(fix_whitespaces ${cfg_sessions_session}).lnk" \
    301   --xres "${x}" \   --xres "${x}" \
    302   --yres "${y}"   --yres "${y}"
    303    
    304   y=$((${y} + 80))   y=$((${y} + 80))
    305   done   done
    306    
    307     for i in ${other_menuitem_list}
      # generate program icons  
      icon_list="${ALX_PROGRAMS}"  
       
      progsh_path=${ALX_UNPRIV_HOME}/.alxprogs  
       
      for item in ${icon_list}  
    308   do   do
    309   # abort if empty   # abort if empty
    310   [[ -z ${item} ]] && continue   [[ -z ${i} ]] && continue
    311    
    312     # get database information
    313     evaluate_table cfg_other_menuitems "where serial='${ALX_SERIAL}' and id='${i}'"
    314    
    315   # new line if x > xres   # new line if x > xres
    316   if [ ${x} -ge ${xres} ]   if [ ${x} -ge ${xres} ]
    # Line 387  generate_all_desktop_icons() Line 330  generate_all_desktop_icons()
    330   fi   fi
    331    
    332   generate_icon \   generate_icon \
    333   --name "${item}" \   --name "${cfg_other_menuitems_name}" \
    334   --command "${progsh_path}/${item}" \   --command "${progsh_path}/$(fix_whitespaces ${cfg_other_menuitems_name})" \
    335   --icon "${ALX_SESSIONS_ICONS}/${item}.png" \   --icon "${ALX_SESSIONS_ICONS}/$(fix_whitespaces ${cfg_other_menuitems_name}).png" \
    336   --dest "${ALX_UNPRIV_HOME}/.xtdesktop/${item}.lnk" \   --dest "${dest}/$(fix_whitespaces ${cfg_other_menuitems_name}).lnk" \
    337   --xres "${x}" \   --xres "${x}" \
    338   --yres "${y}" \   --yres "${y}" \
    339   --default-icon "default_item.png"   --default-icon "default_item.png"
    # Line 398  generate_all_desktop_icons() Line 341  generate_all_desktop_icons()
    341   y=$((${y} + 80))   y=$((${y} + 80))
    342   done   done
    343    
       
       
    344   # last but not least gen a icon with some sys informations   # last but not least gen a icon with some sys informations
    345   local sysinfo   local sysinfo
    346   local hostname   local hostname
    # Line 422  generate_all_desktop_icons() Line 363  generate_all_desktop_icons()
    363   --name "${sysinfo}" \   --name "${sysinfo}" \
    364   --command "exit 0" \   --command "exit 0" \
    365   --icon "${ALX_SESSIONS_ICONS}/sysinfo.png" \   --icon "${ALX_SESSIONS_ICONS}/sysinfo.png" \
    366   --dest "${ALX_UNPRIV_HOME}/.xtdesktop/sysinfo.lnk" \   --dest "${dest}/sysinfo.lnk" \
    367   --xres "${xres}" \   --xres "${xres}" \
    368   --yres "${yres}" \   --yres "${yres}" \
    369   --icon-width "1" \   --icon-width "1" \
    # Line 431  generate_all_desktop_icons() Line 372  generate_all_desktop_icons()
    372    
    373  config_sessions()  config_sessions()
    374  {  {
      # generate ica session files  
      generate_ica_session_files  
       
      # first of all get the vars  
      get_sessions_settings  
      get_autostart_settings  
      get_screensaver_settings  
       
      local count=${#ALX_SESSIONS[*]}  
      local icon  
    375   local i   local i
    376     local all_ses_ids
    377     local all_other_ids
    378   local CONFIG   local CONFIG
    379     local screensaver_passwd_cmd
    380    
    381     # get all session ids from database
    382     all_ses_ids=$(mysqldo "select id from cfg_sessions where serial='${ALX_SERIAL}'")
    383     # get all other_menutiem ids from database
    384     all_other_ids=$(mysqldo "select id from cfg_other_menuitems where serial='${ALX_SERIAL}'")
    385    
    386     # get screensaver settings
    387     evaluate_table cfg_screensaver
    388     # get autostart settings
    389     evaluate_table cfg_autostart
    390     # get current color depth
    391     evaluate_table cfg_graphic
    392    
    393   # now setup fluxbox for user station   # now setup fluxbox for user station
    394    
    # Line 453  config_sessions() Line 399  config_sessions()
    399   # now generate fluxbox config files   # now generate fluxbox config files
    400    
    401   # fluxbox main config   # fluxbox main config
    402   cat ${ALX_SKELETONS}/fluxbox/init \   cat ${ALX_SKELETONS}/fluxbox/init > ${ALX_UNPRIV_HOME}/.fluxbox/init
      > ${ALX_UNPRIV_HOME}/.fluxbox/init  
    403    
    404   # fluxbox autostart   # fluxbox autostart
    405   cat ${ALX_SKELETONS}/fluxbox/apps \   CONFIG="${ALX_UNPRIV_HOME}/.fluxbox/apps"
    406   > ${ALX_UNPRIV_HOME}/.fluxbox/apps   # add icon utility
    407     [ -x /usr/bin/idesk ] && addconfig '[startup] {nohup idesk > /dev/null &}'
    408     [ -x /usr/bin/xtdesk ] && addconfig '[startup] {nohup xtdesk > /dev/null &}'
    409     # add numlock utility
    410     [ -x /usr/bin/numlockx ] && addconfig '[startup] {nohup numlockx on &}'
    411    
      CONFIG=${ALX_UNPRIV_HOME}/.fluxbox/apps  
    412   # add screensaver   # add screensaver
    413   if [[ ! -z ${ALX_SCRN_SAVER} ]] && [[ ! -z ${ALX_SCRN_TIMEOUT} ]]   if [[ ! -z ${cfg_screensaver_screensaver} ]] && [[ ! -z ${cfg_screensaver_screensaver_timeout} ]]
    414   then   then
    415   local ALX_PASSWD_CMD   if [[ -z ${cfg_screensaver_password} ]] || [[ ${cfg_screensaver_password} = NULL ]]
       
      if [[ -z ${ALX_SCRN_PASSWD} ]] || [[ ${ALX_SCRN_PASSWD} = NULL ]]  
    416   then   then
    417   ALX_PASSWD_CMD="-nolock"   screensaver_passwd_cmd="-nolock"
    418   else   else
    419   ALX_PASSWD_CMD="-cpasswd $(cryptpw -m des ${ALX_SCRN_PASSWD})"   screensaver_passwd_cmd="-cpasswd $(cryptpw -m des ${cfg_screensaver_password})"
    420   fi   fi
    421    
    422   addconfig "[startup] {nohup xautolock -time ${ALX_SCRN_TIMEOUT} -locker 'xlock -mode ${ALX_SCRN_SAVER} ${ALX_PASSWD_CMD}' > /dev/null &}"   addconfig "[startup] {nohup xautolock -time ${cfg_screensaver_timeout} -locker 'xlock -mode ${cfg_screensaver_screensaver} ${screensaver_passwd_cmd}' > /dev/null &}"
    423   fi   fi
    424    
    425   # add autostart session   # add autostart session
    426   if [[ ! -z ${ALX_AUTOSTART} ]]   if [[ ! -z ${cfg_autostart_session} ]]
    427   then   then
    428   addconfig "[startup] {nohup nice -n 19 wfica ${ALX_ICA_SESSIONS}/${ALX_AUTOSTART} &}"   # sleep one second to wait until busybox is fully initialized and the screen is really centered
    429     addconfig "[startup] {sleep 1 && nohup nice -n 19 wfica ${ALX_ICA_SESSIONS}/$(fix_whitespaces ${cfg_autostart_session}) &}"
    430   fi   fi
    431    
    432   # fluxbox hotkeys   # fluxbox hotkeys
    433   cat ${ALX_SKELETONS}/fluxbox/keys > ${ALX_UNPRIV_HOME}/.fluxbox/keys   cat ${ALX_SKELETONS}/fluxbox/keys > ${ALX_UNPRIV_HOME}/.fluxbox/keys
    434    
    435   # generate a fluxbox menu   # generate a fluxbox menu
    436   CONFIG=${ALX_UNPRIV_HOME}/.fluxbox/menu   CONFIG="${ALX_UNPRIV_HOME}/.fluxbox/menu"
    437   clearconfig   clearconfig
    438    
    439   # fluxbox menu header   # fluxbox menu header
    440   cat ${ALX_SKELETONS}/fluxbox/menu.header >> ${ALX_UNPRIV_HOME}/.fluxbox/menu   cat ${ALX_SKELETONS}/fluxbox/menu.header >> ${ALX_UNPRIV_HOME}/.fluxbox/menu
       
    441   # now fix it with proper messages :P   # now fix it with proper messages :P
    442   local ver="$(< /etc/mageversion)"   local ver="$(< /etc/mageversion)"
    443   sed -i "s:@CHANGEME@:alx-${ver}  #${ALX_SERIAL}:g" ${ALX_UNPRIV_HOME}/.fluxbox/menu   sed -i "s:@CHANGEME@:alx-${ver}  #${ALX_SERIAL}:g" ${ALX_UNPRIV_HOME}/.fluxbox/menu
       
    444   # add a newline (maybe there is no crlf in the header)   # add a newline (maybe there is no crlf in the header)
    445   addconfig   addconfig
    446    
    447   # fluxbox menu sessions   # first generate session files
    448   for (( i=0; i < count; i++ ))   for i in ${all_ses_ids}
    449   do   do
    450   if [[ ! -z ${ALX_SESSIONS[${i}]} ]]   evaluate_table cfg_sessions "where serial='${ALX_SERIAL}' and id='${i}'"
    451   then   generate_ica_session_file \
    452   addconfig "[exec] ($(basename ${ALX_SESSIONS[${i}]} .ica)) {nice -n 19 wfica ${ALX_ICA_SESSIONS}/${ALX_SESSIONS[${i}]}}"   --session "${cfg_sessions_session}" \
    453   fi   --filename "$(fix_whitespaces ${cfg_sessions_filename})" \
    454     --username "${cfg_sessions_username}" \
    455     --password "${cfg_sessions_password}" \
    456     --domain "${cfg_sessions_domain}" \
    457     --server "${cfg_sessions_browseradrs}" \
    458     --colordepth "${cfg_graphic_depth}"
    459    
    460     # fluxbox menusession
    461     addconfig "[exec] (${cfg_sessions_session}) {nice -n 19 wfica ${ALX_ICA_SESSIONS}/$(fix_whitespaces ${cfg_sessions_filename})}"
    462   done   done
    463    
    464     # delete all progs
    465     progsh_path="${ALX_UNPRIV_HOME}/.alxprogs"
    466     [ -d ${progsh_path} ] && rm -rf ${progsh_path}
    467     install -d ${progsh_path}
    468    
    469   # add other menuitems   # add other menuitems
    470   addconfig $(get_other_menuitems)   for i in ${all_other_ids}
    471     do
    472     evaluate_table cfg_other_menuitems "where serial='${ALX_SERIAL}' and id='${i}'"
    473    
    474     # now echo config line for fluxbox-menu
    475     # make it "configureable" :p
    476     if [[ -n ${cfg_other_menuitems_workdir} ]]
    477     then
    478     workdir="--workdir ${cfg_other_menuitems_workdir}"
    479     fi
    480     if [[ -n ${cfg_other_menuitems_icon} ]]
    481     then
    482     cfg_other_menuitems_icon="<${cfg_other_menuitems_icon}>"
    483     fi
    484    
    485     # gen prog startup wrapper
    486     generate_program_sh \
    487     --name "${cfg_other_menuitems_name}" \
    488     --exec "${cfg_other_menuitems_exec}" \
    489     --param "${cfg_other_menuitems_param}" \
    490     --dest "${progsh_path}/$(fix_whitespaces ${cfg_other_menuitems_name})" \
    491     "${workdir}"
    492    
    493     addconfig "[exec] (${cfg_other_menuitems_name}) {${progsh_path}/$(fix_whitespaces ${cfg_other_menuitems_name})} ${cfg_other_menuitems_icon}"
    494     done
    495    
    496   # fluxbox menu footer   # fluxbox menu footer
    497   cat ${ALX_SKELETONS}/fluxbox/menu.footer >> ${ALX_UNPRIV_HOME}/.fluxbox/menu   cat ${ALX_SKELETONS}/fluxbox/menu.footer >> ${ALX_UNPRIV_HOME}/.fluxbox/menu
       
    498   # add a newline (maybe there is no crlf in the footer)   # add a newline (maybe there is no crlf in the footer)
    499   addconfig   addconfig
    500    
    501   # now it's a good time to generate *all* icons :)   # now it's a good time to generate *all* icons :)
    502   generate_all_desktop_icons   generate_all_desktop_icons "${all_ses_ids}" "${all_other_ids}"
    503    
    504   # set correct permissions   # fix permissions
    505   chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}   chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}
    506   chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}/.fluxbox   chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}/.fluxbox
    507   chmod 0755 ${ALX_UNPRIV_HOME}/.fluxbox   chmod 0755 ${ALX_UNPRIV_HOME}/.fluxbox
    508   chmod 0755 ${ALX_UNPRIV_HOME}/.xtdesktop   chmod 0755 ${ALX_UNPRIV_HOME}/.xtdesktop
    509   chmod 0644 ${ALX_UNPRIV_HOME}/.xtdeskrc   chmod 0644 ${ALX_UNPRIV_HOME}/.xtdeskrc
       
      # unset vars  
      unset ALX_SESSIONS  
      unset ALX_PROGRAMS  
      unset ALX_SCRN_SAVER  
      unset ALX_SCRN_TIMEOUT  
      unset ALX_SCRN_PASSWD  
    510  }  }
    Legend:
    Removed from v.2035  
    changed lines
      Added in v.2435