Magellan Linux

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

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

revision 2001 by niro, Mon May 9 14:51:55 2011 UTC revision 2161 by niro, Wed May 18 14:35:13 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  
8  }  }
9    
10  get_screensaver_settings()  # helper function to create citrix session files
11    generate_ica_session_file()
12  {  {
  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  
 }  
   
 generate_ica_session_files()  
 {  
  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 64  generate_ica_session_files() Line 19  generate_ica_session_files()
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   local CONFIG
23    
24     # very basic getops
25     for i in $*
26     do
27     case $1 in
28     --session) shift; ses_session="$1" ;;
29     --filename) shift; ses_filename="$1" ;;
30     --username) shift; ses_username="$1" ;;
31     --password) shift; ses_password="$1" ;;
32     --domain) shift; ses_domain="$1" ;;
33     --server) shift; ses_browseradrs="$1" ;;
34             esac
35     shift
36     done
37    
38     # abort if session, filename or server not given
39     [[ -z ${ses_session} ]] && return 1
40     [[ -z ${ses_filename} ]] && return 1
41     [[ -z ${ses_browseradrs} ]] && return 1
42    
43     # write session files
44     CONFIG="${ALX_ICA_SESSIONS}/${ses_filename}"
45     clearconfig
46    
47   # get settings from database   addconfig '[WFClient]'
48   all_ids=$(mysqldo "select id from cfg_sessions where serial='${ALX_SERIAL}'")   addconfig 'Version=2'
49    
50   for i in ${all_ids}   # use ';' as ifs
51     declare -i i=0
52     for server in ${ses_browseradrs//;/ }
53   do   do
54   # get settings   (( i++ ))
55   ses_session=$(mysqldo "select session from cfg_sessions where serial='${ALX_SERIAL}' and id='${i}'")   num="${i}"
56   ses_filename=$(mysqldo "select filename from cfg_sessions where serial='${ALX_SERIAL}' and id='${i}'")   # support newer ica-clients:
57   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 !!
58   ses_domain=$(mysqldo "select domain from cfg_sessions where serial='${ALX_SERIAL}' and id='${i}'")   [[ ${i} -eq 1 ]] && num=""
59   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  
  echo '[WFClient]' > ${ALX_ICA_SESSIONS}/${ses_filename}  
  echo 'Version=2' >> ${ALX_ICA_SESSIONS}/${ses_filename}  
  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=""  
  echo "TcpBrowserAddress${browser_address_num}=${server}" >> ${ALX_ICA_SESSIONS}/${ses_filename}  
  done  
  IFS="${OLD_IFS}"  
  unset x  
  unset OLD_IFS  
   
  echo 'ScreenPercent=0' >> ${ALX_ICA_SESSIONS}/${ses_filename}  
   
  echo '[ApplicationServers]' >> ${ALX_ICA_SESSIONS}/${ses_filename}  
  echo "${ses_session}=" >> ${ALX_ICA_SESSIONS}/${ses_filename}  
   
  echo "[${ses_session}]" >> ${ALX_ICA_SESSIONS}/${ses_filename}  
  echo "Address=${ses_session}" >> ${ALX_ICA_SESSIONS}/${ses_filename}  
  echo "InitialProgram=#${ses_session}" >> ${ALX_ICA_SESSIONS}/${ses_filename}  
  echo "DesiredColor=${ses_colors}" >> ${ALX_ICA_SESSIONS}/${ses_filename}  
  echo 'TransportDriver=TCP/IP' >> ${ALX_ICA_SESSIONS}/${ses_filename}  
  echo 'WinStationDriver=ICA 3.0' >> ${ALX_ICA_SESSIONS}/${ses_filename}  
  echo "ClearPassword=${ses_password}" >> ${ALX_ICA_SESSIONS}/${ses_filename}  
  echo "Username=${ses_username}" >> ${ALX_ICA_SESSIONS}/${ses_filename}  
  echo "Domain=${ses_domain}" >> ${ALX_ICA_SESSIONS}/${ses_filename}  
  echo 'UseFullScreen=Yes' >> ${ALX_ICA_SESSIONS}/${ses_filename}  
  echo 'NoWindowManager=True' >> ${ALX_ICA_SESSIONS}/${ses_filename}  
60   done   done
61    
62     addconfig 'ScreenPercent=0'
63     addconfig '[ApplicationServers]'
64     addconfig "${ses_session}="
65     addconfig "[${ses_session}]"
66     addconfig "Address=${ses_session}"
67     addconfig "InitialProgram=#${ses_session}"
68     addconfig 'TransportDriver=TCP/IP'
69     addconfig 'WinStationDriver=ICA 3.0'
70     addconfig "ClearPassword=${ses__password}"
71     addconfig "Username=${ses_username}"
72     addconfig "Domain=${ses_domain}"
73     addconfig 'UseFullScreen=Yes'
74     addconfig 'NoWindowManager=True'
75  }  }
76    
77  # generates a sh file to start programs  # generates a sh file to start programs
# Line 133  generate_program_sh() Line 80  generate_program_sh()
80   local dest   local dest
81   local name   local name
82   local exec   local exec
83     local param
84   local workdir   local workdir
85     local CONFIG
86    
87   # very basic getops   # very basic getops
88   for i in $*   for i in $*
# Line 141  generate_program_sh() Line 90  generate_program_sh()
90   case $1 in   case $1 in
91   --name|-n) shift; name="$1" ;;   --name|-n) shift; name="$1" ;;
92   --exec|-x) shift; exec="$1" ;;   --exec|-x) shift; exec="$1" ;;
93     --param|-p) shift; param="$1" ;;
94   --dest|-d) shift; dest="$1" ;;   --dest|-d) shift; dest="$1" ;;
95   --workdir|-w) shift; workdir="$1" ;;   --workdir|-w) shift; workdir="$1" ;;
96           esac           esac
# Line 148  generate_program_sh() Line 98  generate_program_sh()
98   done   done
99    
100   # abort if name, dest or exec not given   # abort if name, dest or exec not given
101   [ -z "${name}" ] && return 1   [[ -z ${name} ]] && return 1
102   [ -z "${exec}" ] && return 1   [[ -z ${exec} ]] && return 1
103   [ -z "${dest}" ] && return 1   [[ -z ${dest} ]] && return 1
104    
105   echo "#!/bin/sh" > ${dest}   CONFIG="${dest}"
106   [ -n "${workdir}" ] && echo "cd ${workdir}" >> ${dest}   addconfig "#!/bin/sh"
107   echo "exec ${exec}" >> ${dest}   [ -n "${workdir}" ] && addconfig "cd ${workdir}"
108     addconfig "exec ${exec} ${param}"
109    
110   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  
111  }  }
112    
113  # helper functions for generate all desktop icons  # helper functions for generate all desktop icons
# Line 217  generate_icon() Line 122  generate_icon()
122   local iwidth   local iwidth
123   local iheight   local iheight
124   local deficon   local deficon
125     local CONFIG
126    
127   # very basic getops   # very basic getops
128   for i in $*   for i in $*
# Line 235  generate_icon() Line 141  generate_icon()
141   shift   shift
142   done   done
143    
144   # some sanity checks :   # some sanity checks:
145    
146   # abort if name or command not given   # abort if name or command not given
147   [ -z "${name}" ] && return 1   [[ -z ${name} ]] && return 1
148   [ -z "${command}" ] && return 1   [[ -z ${command} ]] && return 1
149    
150   # use some defaults for icon, dest, {x,y}res   # use some defaults for icon, dest, {x,y}res
151   [ -z "${xres}" ] && xres=30   [[ -z ${xres} ]] && xres=30
152   [ -z "${yres}" ] && xres=30   [[ -z ${yres} ]] && xres=30
153   [ -z "${dest}" ] && dest="${ALX_UNPRIV_HOME}/.xtdesktop/${name}.lnk"   [[ -z ${dest} ]] && dest="${ALX_UNPRIV_HOME}/.xtdesktop/${name}.lnk"
154   if [ -z "${icon}" ] || [ ! -f "${icon}" ]   if [[ -z ${icon} ]] || [ ! -f ${icon} ]
155   then   then
156   # if no default icon is given use default.png   # if no default icon is given use default.png
157   [ -z "${deficon}" ] && deficon="default.png"   [[ -z ${deficon} ]] && deficon="default.png"
158   icon="${ALX_SESSIONS_ICONS}/${deficon}"   icon="${ALX_SESSIONS_ICONS}/${deficon}"
159   fi   fi
160    
161   echo "table Icon" > ${dest}   CONFIG="${dest}"
162   echo "  Type: Program" >> ${dest}   clearconfig
163   echo "  Caption: ${name}" >> ${dest}  
164   echo "  Command: ${command}" >> ${dest}   addconfig 'table Icon'
165   echo "  Icon: ${icon}" >> ${dest}   addconfig '  Type: Program'
166   echo "  X: ${xres}" >> ${dest}   addconfig "  Caption: ${name}"
167   echo "  Y: ${yres}" >> ${dest}   addconfig "  Command: ${command}"
168     addconfig "  Icon: ${icon}"
169     addconfig "  X: ${xres}"
170     addconfig "  Y: ${yres}"
171    
172   # add these only if not zero   # add these only if not zero
173   if [ -n "${iwidth}" ] && [ -n "${iheight}" ]   if [[ ! -z ${iwidth} ]] && [[ ! -z ${iheight} ]]
174   then   then
175   echo "  IconWidth: ${iwidth}" >> ${dest}   addconfig "  IconWidth: ${iwidth}"
176   echo "  IconHeight: ${iheight}" >> ${dest}   addconfig "  IconHeight: ${iheight}"
177   fi   fi
178    
179   echo "end" >> ${dest}   addconfig 'end'
180  }  }
181    
182  generate_all_desktop_icons()  generate_all_desktop_icons()
183  {  {
184     local session_list="$1"
185     local other_menuitem_list="$2"
186   local res   local res
187   local xres   local xres
188   local yres   local yres
  local icon_list  
189   local x   local x
190   local y   local y
191   local item   local i
192   local basename_item   local name
193   local progsh_path   local progsh_path
194    
195     # progsh path
196     progsh_path="${ALX_UNPRIV_HOME}/.alxprogs"
197    
198   # get the resolution   # get the resolution
199   res=$(mysqldo "select resolution from cfg_graphic where serial='${ALX_SERIAL}'")   res=$(mysqldo "select resolution from cfg_graphic where serial='${ALX_SERIAL}'")
200    
201   # split res to x & y   # split res to x & y
202   xres="$(echo ${res} | cut -dx -f1)"   xres="${res%x*}"
203   yres="$(echo ${res} | cut -dx -f2)"   xres="${res#*x}"
204    
205   # top left edge of the icon is given in config file   # top left edge of the icon is given in config file
206   # remove a little bit to simulate the bottom-right edge   # remove a little bit to simulate the bottom-right edge
# Line 301  generate_all_desktop_icons() Line 214  generate_all_desktop_icons()
214   [ -d ${ALX_UNPRIV_HOME}/.xtdesktop ] && rm -rf ${ALX_UNPRIV_HOME}/.xtdesktop   [ -d ${ALX_UNPRIV_HOME}/.xtdesktop ] && rm -rf ${ALX_UNPRIV_HOME}/.xtdesktop
215   install -d ${ALX_UNPRIV_HOME}/.xtdesktop   install -d ${ALX_UNPRIV_HOME}/.xtdesktop
216    
   
217   # default settings   # default settings
218   declare -i x=30   declare -i x=30
219   declare -i y=30   declare -i y=30
220    
221   # first all ica sessions   # ica icons
222   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}  
223   do   do
224   # abort if empty   # abort if empty
225   [ -z "${item}" ] && continue   [[ -z ${i} ]] && continue
226    
227     # get database information
228     evaluate_table cfg_sessions "where serial='${ALX_SERIAL}' and id='${i}'"
229    
230   # new line if x > xres   # new line if x > xres
231   if [ ${x} -ge ${xres} ];then   if [ ${x} -ge ${xres} ]
232     then
233   x=30   x=30
234   y=$((${y} + 80))   y=$((${y} + 80))
235   fi   fi
236    
237   # new row if y > yres   # new row if y > yres
238   if [ ${y} -ge ${yres} ];then   if [ ${y} -ge ${yres} ]
239     then
240   x=$((${x} + 120))   x=$((${x} + 120))
241   y=30   y=30
242    
# Line 334  generate_all_desktop_icons() Line 244  generate_all_desktop_icons()
244   [ ${x} -ge ${xres} ] && x=30   [ ${x} -ge ${xres} ] && x=30
245   fi   fi
246    
  # ica icons  
  # get basename (.ica must be suffix)  
  basename_item="$(basename ${item} .ica)"  
247   generate_icon \   generate_icon \
248   --name "${basename_item}" \   --name "${cfg_session_session}" \
249   --command "nice -n 19 wfica ${ALX_ICA_SESSIONS}/${item}" \   --command "nice -n 19 wfica ${ALX_ICA_SESSIONS}/$(fix_whitespaces ${cfg_session_filename})" \
250   --icon "${ALX_SESSIONS_ICONS}/${basename_item}.png" \   --icon "${ALX_SESSIONS_ICONS}/$(fix_whitespaces ${cfg_session_session}).png" \
251   --dest "${ALX_UNPRIV_HOME}/.xtdesktop/${basename_item}.lnk" \   --dest "${ALX_UNPRIV_HOME}/.xtdesktop/$(fix_whitespaces ${cfg_session_session}).lnk" \
252   --xres "${x}" \   --xres "${x}" \
253   --yres "${y}"   --yres "${y}"
254    
255   y=$((${y} + 80))   y=$((${y} + 80))
256   done   done
257    
258     for i in ${other_menuitem_list}
  # generate program icons  
  icon_list="${ALX_PROGRAMS}"  
   
  progsh_path=${ALX_UNPRIV_HOME}/.alxprogs  
   
  for item in ${icon_list}  
259   do   do
260   # abort if empty   # abort if empty
261   [ -z "${item}" ] && continue   [[ -z ${i} ]] && continue
262    
263     # get database information
264     evaluate_table cfg_other_menuitems "where serial='${ALX_SERIAL}' and id='${i}'"
265    
266   # new line if x > xres   # new line if x > xres
267   if [ ${x} -ge ${xres} ];then   if [ ${x} -ge ${xres} ]
268     then
269   x=30   x=30
270   y=$((${y} + 80))   y=$((${y} + 80))
271   fi   fi
272    
273   # new row if y > yres   # new row if y > yres
274   if [ ${y} -ge ${yres} ];then   if [ ${y} -ge ${yres} ]
275     then
276   x=$((${x} + 120))   x=$((${x} + 120))
277   y=30   y=30
278    
# Line 375  generate_all_desktop_icons() Line 281  generate_all_desktop_icons()
281   fi   fi
282    
283   generate_icon \   generate_icon \
284   --name "${item}" \   --name "${cfg_other_menuitems_name}" \
285   --command "${progsh_path}/${item}" \   --command "${progsh_path}/$(fix_whitespaces ${cfg_other_menuitems_exec})" \
286   --icon "${ALX_SESSIONS_ICONS}/${item}.png" \   --icon "${ALX_SESSIONS_ICONS}/$(fix_whitespaces ${cfg_other_menuitems_name}).png" \
287   --dest "${ALX_UNPRIV_HOME}/.xtdesktop/${item}.lnk" \   --dest "${ALX_UNPRIV_HOME}/.xtdesktop/$(fix_whitespaces ${cfg_other_menuitems_name}).lnk" \
288   --xres "${x}" \   --xres "${x}" \
289   --yres "${y}" \   --yres "${y}" \
290   --default-icon "default_item.png"   --default-icon "default_item.png"
# Line 386  generate_all_desktop_icons() Line 292  generate_all_desktop_icons()
292   y=$((${y} + 80))   y=$((${y} + 80))
293   done   done
294    
   
   
295   # last but not least gen a icon with some sys informations   # last but not least gen a icon with some sys informations
296   local sysinfo   local sysinfo
297   local hostname   local hostname
# Line 419  generate_all_desktop_icons() Line 323  generate_all_desktop_icons()
323    
324  config_sessions()  config_sessions()
325  {  {
  # 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  
326   local i   local i
327     local all_ses_ids
328     local all_other_ids
329     local CONFIG
330     local screensaver_passwd_cmd
331    
332     # get all session ids from database
333     all_ses_ids=$(mysqldo "select id from cfg_sessions where serial='${ALX_SERIAL}'")
334     # get all other_menutiem ids from database
335     all_other_ids=$(mysqldo "select id from cfg_other_menuitems where serial='${ALX_SERIAL}'")
336    
337     # get screensaver settings
338     evaluate_table cfg_screensaver
339     # get autostart settings
340     evaluate_table cfg_autostart
341    
342   # now setup fluxbox for user station   # now setup fluxbox for user station
343    
# Line 440  config_sessions() Line 348  config_sessions()
348   # now generate fluxbox config files   # now generate fluxbox config files
349    
350   # fluxbox main config   # fluxbox main config
351   cat ${ALX_SKELETONS}/fluxbox/init \   cat ${ALX_SKELETONS}/fluxbox/init > ${ALX_UNPRIV_HOME}/.fluxbox/init
  > ${ALX_UNPRIV_HOME}/.fluxbox/init  
352    
353   # fluxbox autostart   # fluxbox autostart
354   cat ${ALX_SKELETONS}/fluxbox/apps \   cat ${ALX_SKELETONS}/fluxbox/apps > ${ALX_UNPRIV_HOME}/.fluxbox/apps
  > ${ALX_UNPRIV_HOME}/.fluxbox/apps  
355    
356     CONFIG="${ALX_UNPRIV_HOME}/.fluxbox/apps"
357   # add screensaver   # add screensaver
358   if [[ -n ${ALX_SCRN_SAVER} ]] && [[ -n ${ALX_SCRN_TIMEOUT} ]]   if [[ ! -z ${cfg_screensaver_screensaver} ]] && [[ ! -z ${cfg_screensaver_screensaver_timeout} ]]
359   then   then
360   local ALX_PASSWD_CMD   if [[ -z ${cfg_screensaver_password} ]] || [[ ${cfg_screensaver_password} = NULL ]]
   
  if [[ -z ${ALX_SCRN_PASSWD} ]] || [[ ${ALX_SCRN_PASSWD} = NULL ]]  
361   then   then
362   ALX_PASSWD_CMD="-nolock"   screensaver_passwd_cmd="-nolock"
363   else   else
364   ALX_PASSWD_CMD="-cpasswd $(openssl passwd ${ALX_SCRN_PASSWD})"   screensaver_passwd_cmd="-cpasswd $(cryptpw -m des ${cfg_screensaver_password})"
365   fi   fi
366    
367   echo "[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 &}"
  >> ${ALX_UNPRIV_HOME}/.fluxbox/apps  
368   fi   fi
369    
370   # add autostart session   # add autostart session
371   if [[ ${ALX_AUTOSTART} != "" ]]   if [[ ! -z ${cfg_autostart_session} ]]
372   then   then
373   echo "[startup] {nohup nice -n 19 wfica ${ALX_ICA_SESSIONS}/${ALX_AUTOSTART} &}" \   addconfig "[startup] {nohup nice -n 19 wfica ${ALX_ICA_SESSIONS}/$(fix_whitespaces ${cfg_autostart_session}) &}"
  >> ${ALX_UNPRIV_HOME}/.fluxbox/apps  
374   fi   fi
375    
376   # fluxbox hotkeys   # fluxbox hotkeys
377   cat ${ALX_SKELETONS}/fluxbox/keys \   cat ${ALX_SKELETONS}/fluxbox/keys > ${ALX_UNPRIV_HOME}/.fluxbox/keys
  > ${ALX_UNPRIV_HOME}/.fluxbox/keys  
378    
379   # fluxbox menu header   # generate a fluxbox menu
380   cat ${ALX_SKELETONS}/fluxbox/menu.header \   CONFIG="${ALX_UNPRIV_HOME}/.fluxbox/menu"
381   > ${ALX_UNPRIV_HOME}/.fluxbox/menu   clearconfig
382    
383     # fluxbox menu header
384     cat ${ALX_SKELETONS}/fluxbox/menu.header >> ${ALX_UNPRIV_HOME}/.fluxbox/menu
385   # now fix it with proper messages :P   # now fix it with proper messages :P
386   local ver="$(< /etc/mageversion)"   local ver="$(< /etc/mageversion)"
387   sed -i "s:@CHANGEME@:alx-${ver}  #${ALX_SERIAL}:g" \   sed -i "s:@CHANGEME@:alx-${ver}  #${ALX_SERIAL}:g" ${ALX_UNPRIV_HOME}/.fluxbox/menu
  ${ALX_UNPRIV_HOME}/.fluxbox/menu  
   
388   # add a newline (maybe there is no crlf in the header)   # add a newline (maybe there is no crlf in the header)
389   echo >> ${ALX_UNPRIV_HOME}/.fluxbox/menu   addconfig
390    
391   # fluxbox menu sessions   # first generate session files
392   for (( i=0; i < count; i++ ))   for i in ${all_ses_ids}
393   do   do
394   [ -n "${ALX_SESSIONS[${i}]}" ] && \   evaluate_table cfg_sessions "where serial='${ALX_SERIAL}' and id='${i}'"
395   echo "[exec] ($(basename ${ALX_SESSIONS[${i}]} .ica)) {nice -n 19 wfica ${ALX_ICA_SESSIONS}/${ALX_SESSIONS[${i}]}}" \   generate_ica_session_file \
396   >> ${ALX_UNPRIV_HOME}/.fluxbox/menu   --session "${cfg_sessions_session}" \
397     --filename "$(fix_whitespaces ${cfg_sessions_filename})" \
398     --username "${cfg_sessions_username}" \
399     --password "${cfg_sessions_password}" \
400     --domain "${cfg_sessions_domain}" \
401     --server "${cfg_sessions_browseradrs}"
402    
403     # fluxbox menusession
404     addconfig "[exec] (${cfg_sessions_session}) {nice -n 19 wfica ${ALX_ICA_SESSIONS}/$(fix_whitespaces ${cfg_sessions_filename})}"
405   done   done
406    
407     # delete all progs
408     progsh_path="${ALX_UNPRIV_HOME}/.alxprogs"
409     [ -d ${progsh_path} ] && rm -rf ${progsh_path}
410     install -d ${progsh_path}
411    
412   # add other menuitems   # add other menuitems
413   get_other_menuitems >> ${ALX_UNPRIV_HOME}/.fluxbox/menu   for i in ${all_other_ids}
414     do
415     evaluate_table cfg_other_menuitems "where serial='${ALX_SERIAL}' and id='${i}'"
416    
417   # fluxbox menu footer   # now echo config line for fluxbox-menu
418   cat ${ALX_SKELETONS}/fluxbox/menu.footer \   # make it "configureable" :p
419   >> ${ALX_UNPRIV_HOME}/.fluxbox/menu   if [[ -n ${cfg_other_menuitems_workdir} ]]
420     then
421     workdir="--workdir ${cfg_other_menuitems_workdir}"
422     fi
423     if [[ -n ${cfg_other_menuitems_icon} ]]
424     then
425     cfg_other_menuitems_icon="<${cfg_other_menuitems_icon}>"
426     fi
427    
428     # gen prog startup wrapper
429     generate_program_sh \
430     --name "${cfg_other_menuitems_name}" \
431     --exec "${cfg_other_menuitems_exec}" \
432     --param "${cfg_other_menuitems_param}" \
433     --dest "${progsh_path}/$(fix_whitespaces ${cfg_other_menuitems_name})" \
434     "${workdir}"
435    
436     addconfig "[exec] (${cfg_other_menuitems_name}) {${progsh_path}/$(fix_whitespaces ${cfg_other_menuitems_name})} ${cfg_other_menuitems_icon}"
437     done
438    
439     # fluxbox menu footer
440     cat ${ALX_SKELETONS}/fluxbox/menu.footer >> ${ALX_UNPRIV_HOME}/.fluxbox/menu
441   # add a newline (maybe there is no crlf in the footer)   # add a newline (maybe there is no crlf in the footer)
442   echo >> ${ALX_UNPRIV_HOME}/.fluxbox/menu   addconfig
443    
444   # now it's a good time to generate *all* icons :)   # now it's a good time to generate *all* icons :)
445   generate_all_desktop_icons   generate_all_desktop_icons "${all_ses_ids}" "${all_other_ids}"
446    
447   # set correct permissions   # fix permissions
448   chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}   chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}
449   chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}/.fluxbox   chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}/.fluxbox
450   chmod 0755 ${ALX_UNPRIV_HOME}/.fluxbox   chmod 0755 ${ALX_UNPRIV_HOME}/.fluxbox
451   chmod 0755 ${ALX_UNPRIV_HOME}/.xtdesktop   chmod 0755 ${ALX_UNPRIV_HOME}/.xtdesktop
452   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  
453  }  }
   

Legend:
Removed from v.2001  
changed lines
  Added in v.2161