Magellan Linux

Diff of /alx-src/trunk/tinyalxconfig-ng/functions/config_sessions.sh

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

revision 497 by niro, Sat Jun 7 17:10:04 2008 UTC revision 498 by niro, Tue Jun 10 13:15:11 2008 UTC
# Line 1  Line 1 
1  # $Header: /home/cvsd/alx-cvs/alx-src/tinyalxconfig-ng/functions/config_sessions.sh,v 1.3 2008-06-07 17:10:04 niro Exp $  # $Header: /home/cvsd/alx-cvs/alx-src/tinyalxconfig-ng/functions/config_sessions.sh,v 1.4 2008-06-10 13:07:48 niro Exp $
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()  get_sessions_settings()
# Line 40  get_autostart_settings() Line 40  get_autostart_settings()
40   export ALX_AUTOSTART   export ALX_AUTOSTART
41  }  }
42    
43    get_theme_settings()
44    {
45     # get settings from database
46     ALX_THEME=$(mysqldo "select theme from cfg_theme where serial='${ALX_SERIAL}'")
47    
48     # default setting (use old alx-theme atm)
49     [[ -z ${ALX_THEME} ]] && ALX_THEME=LemonSpace
50    
51     export ALX_THEME
52    }
53    
54  get_screensaver_settings()  get_screensaver_settings()
55  {  {
56   ALX_SCRN_SAVER=$(mysqldo "select screensaver from cfg_screensaver where serial='${ALX_SERIAL}'")   ALX_SCRN_SAVER=$(mysqldo "select screensaver from cfg_screensaver where serial='${ALX_SERIAL}'")
# Line 322  generate_all_desktop_icons() Line 333  generate_all_desktop_icons()
333   xres="$(( ${xres} - 120 ))"   xres="$(( ${xres} - 120 ))"
334   yres="$(( ${yres} - 80 ))"   yres="$(( ${yres} - 80 ))"
335    
  # basic config  
  cat ${ALX_SKELETONS}/xtdesktop/xtdeskrc > ${ALX_UNPRIV_HOME}/.xtdeskrc  
   
336   # clean desktop icon location   # clean desktop icon location
337   [ -d ${ALX_UNPRIV_HOME}/.xtdesktop ] && rm -rf ${ALX_UNPRIV_HOME}/.xtdesktop   [ -d ${ALX_UNPRIV_HOME}/.xtdesktop ] && rm -rf ${ALX_UNPRIV_HOME}/.xtdesktop
338   install -d ${ALX_UNPRIV_HOME}/.xtdesktop   install -d ${ALX_UNPRIV_HOME}/.xtdesktop
# Line 447  generate_all_desktop_icons() Line 455  generate_all_desktop_icons()
455    
456  config_sessions()  config_sessions()
457  {  {
458     # get theme settings
459     get_theme_settings
460    
461   # generate ica session files   # generate ica session files
462   generate_ica_session_files   generate_ica_session_files
463    
# Line 459  config_sessions() Line 470  config_sessions()
470   local icon   local icon
471   local i   local i
472    
473     # basic config for xtdeskop
474     cat ${ALX_SKELETONS}/xtdesktop/xtdeskrc-${ALX_THEME} > ${ALX_UNPRIV_HOME}/.xtdeskrc
475    
476   # now setup fluxbox for user station   # now setup fluxbox for user station
477    
478   # create a fresh fluxbox directory   # create a fresh fluxbox directory
# Line 466  config_sessions() Line 480  config_sessions()
480   install -d ${ALX_UNPRIV_HOME}/.fluxbox   install -d ${ALX_UNPRIV_HOME}/.fluxbox
481    
482   # now generate fluxbox config files   # now generate fluxbox config files
483     # copy theme
484     [[ ! -d /usr/share/fluxbox/styles ]] && install -d /usr/share/fluxbox/styles
485     cat ${ALX_SKELETONS}/fluxbox/themes/${ALX_THEME} > /usr/share/fluxbox/styles/default
486    
487   # fluxbox main config   # fluxbox main config
488   cat ${ALX_SKELETONS}/fluxbox/init \   cat ${ALX_SKELETONS}/fluxbox/init > ${ALX_UNPRIV_HOME}/.fluxbox/init
  > ${ALX_UNPRIV_HOME}/.fluxbox/init  
489    
490   # fluxbox autostart   # fluxbox autostart
491   cat ${ALX_SKELETONS}/fluxbox/apps \   cat ${ALX_SKELETONS}/fluxbox/apps > ${ALX_UNPRIV_HOME}/.fluxbox/apps
  > ${ALX_UNPRIV_HOME}/.fluxbox/apps  
492    
493   # add screensaver   # add screensaver
494   if [[ -n ${ALX_SCRN_SAVER} ]] && [[ -n ${ALX_SCRN_TIMEOUT} ]]   if [[ -n ${ALX_SCRN_SAVER} ]] && [[ -n ${ALX_SCRN_TIMEOUT} ]]
# Line 499  config_sessions() Line 514  config_sessions()
514   fi   fi
515    
516   # fluxbox hotkeys   # fluxbox hotkeys
517   cat ${ALX_SKELETONS}/fluxbox/keys \   cat ${ALX_SKELETONS}/fluxbox/keys > ${ALX_UNPRIV_HOME}/.fluxbox/keys
  > ${ALX_UNPRIV_HOME}/.fluxbox/keys  
518    
519   # fluxbox menu header   # fluxbox menu header
520   cat ${ALX_SKELETONS}/fluxbox/menu.header \   cat ${ALX_SKELETONS}/fluxbox/menu.header > ${ALX_UNPRIV_HOME}/.fluxbox/menu
  > ${ALX_UNPRIV_HOME}/.fluxbox/menu  
521    
522   # now fix it with proper messages :P   # now fix it with proper messages :P
523   local ver="$(< /etc/mageversion)"   local ver="$(< /etc/mageversion)"
524   sed -i "s:@CHANGEME@:tinyALX-${ver}  #${ALX_SERIAL}:g" \   sed -i "s:@CHANGEME@:tinyALX-${ver}  #${ALX_SERIAL}:g" ${ALX_UNPRIV_HOME}/.fluxbox/menu
  ${ALX_UNPRIV_HOME}/.fluxbox/menu  
525    
526   # add a newline (maybe there is no crlf in the header)   # add a newline (maybe there is no crlf in the header)
527   echo >> ${ALX_UNPRIV_HOME}/.fluxbox/menu   echo >> ${ALX_UNPRIV_HOME}/.fluxbox/menu
# Line 526  config_sessions() Line 538  config_sessions()
538   get_other_menuitems >> ${ALX_UNPRIV_HOME}/.fluxbox/menu   get_other_menuitems >> ${ALX_UNPRIV_HOME}/.fluxbox/menu
539    
540   # fluxbox menu footer   # fluxbox menu footer
541   cat ${ALX_SKELETONS}/fluxbox/menu.footer \   cat ${ALX_SKELETONS}/fluxbox/menu.footer >> ${ALX_UNPRIV_HOME}/.fluxbox/menu
  >> ${ALX_UNPRIV_HOME}/.fluxbox/menu  
542    
543   # add a newline (maybe there is no crlf in the footer)   # add a newline (maybe there is no crlf in the footer)
544   echo >> ${ALX_UNPRIV_HOME}/.fluxbox/menu   echo >> ${ALX_UNPRIV_HOME}/.fluxbox/menu

Legend:
Removed from v.497  
changed lines
  Added in v.498