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 2411 by niro, Wed Jun 15 13:00:27 2011 UTC revision 2479 by niro, Mon Jun 27 15:20:33 2011 UTC
    # Line 19  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 31  generate_ica_session_file() Line 32  generate_ica_session_file()
    32   --password) shift; ses_password="$1" ;;   --password) shift; ses_password="$1" ;;
    33   --domain) shift; ses_domain="$1" ;;   --domain) shift; ses_domain="$1" ;;
    34   --server) shift; ses_browseradrs="$1" ;;   --server) shift; ses_browseradrs="$1" ;;
    35     --colordepth) shift; ses_colors="$1" ;;
    36           esac           esac
    37   shift   shift
    38   done   done
    # Line 65  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}"
    # Line 148  generate_icon() Line 159  generate_icon()
    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 ?   [[ -z ${dest} ]] && dest="${ALX_UNPRIV_HOME}/.idesktop/${name}.lnk"
      if [ -x /usr/bin/idesk ]  
      then  
      utility="idesk"  
      [[ -z ${dest} ]] && dest="${ALX_UNPRIV_HOME}/.idesktop/${name}.lnk"  
      else  
      utility="xtdesk"  
      [[ -z ${dest} ]] && dest="${ALX_UNPRIV_HOME}/.xtdesktop/${name}.lnk"  
      fi  
    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=30
    # Line 172  generate_icon() Line 175  generate_icon()
    175   clearconfig   clearconfig
    176    
    177   addconfig 'table Icon'   addconfig 'table Icon'
      [[ ${utility} = xtdesk ]] && 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 182  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   if [[ ${utility} = xtdesk ]]   addconfig "  Width: ${iwidth}"
    188   then   addconfig "  Height: ${iheight}"
      addconfig "  IconWidth: ${iwidth}"  
      addconfig "  IconHeight: ${iheight}"  
      fi  
      if [[ ${utility} = idesk ]]  
      then  
      addconfig "  Width: ${iwidth}"  
      addconfig "  Height: ${iheight}"  
      fi  
    189   fi   fi
    190    
    191   addconfig 'end'   addconfig 'end'
    # Line 213  generate_all_desktop_icons() Line 207  generate_all_desktop_icons()
    207   local dest   local dest
    208   local rc   local rc
    209    
    210   # which utility are we using idesk|xtdesk ?   dest="${ALX_UNPRIV_HOME}/.idesktop"
    211   if [ -x /usr/bin/idesk ]   rc="${ALX_UNPRIV_HOME}/.ideskrc"
      then  
      utility="idesk"  
      dest="${ALX_UNPRIV_HOME}/.idesktop"  
      rc="${ALX_UNPRIV_HOME}/.ideskrc"  
      else  
      utility="xtdesk"  
      dest="${ALX_UNPRIV_HOME}/.xtdesktop"  
      rc="${ALX_UNPRIV_HOME}/.xtdeskrc"  
      fi  
       
    212    
    213   # progsh path   # progsh path
    214   progsh_path="${ALX_UNPRIV_HOME}/.alxprogs"   progsh_path="${ALX_UNPRIV_HOME}/.alxprogs"
    # Line 246  generate_all_desktop_icons() Line 230  generate_all_desktop_icons()
    230   [ -f ${rc} ] && rm -f ${rc}   [ -f ${rc} ] && rm -f ${rc}
    231   install -d ${dest}   install -d ${dest}
    232    
     if [[ ${utility} = xtdesk ]]  
     then  
      # basic config  
      cat ${ALX_SKELETONS}/xtdesktop/xtdeskrc > ${ALX_UNPRIV_HOME}/.xtdesktop/xtdeskrc  
     fi  
       
    233   # default settings   # default settings
    234   declare -i x=30   declare -i x=30
    235   declare -i y=30   declare -i y=30
    # Line 330  fi Line 308  fi
    308   y=$((${y} + 80))   y=$((${y} + 80))
    309   done   done
    310    
    311     # add shutdown, reboot icons
    312     for i in shutdown reboot
    313     do
    314     # new line if x > xres
    315     if [ ${x} -ge ${xres} ]
    316     then
    317     x=30
    318     y=$((${y} + 80))
    319     fi
    320    
    321     # new row if y > yres
    322     if [ ${y} -ge ${yres} ]
    323     then
    324     x=$((${x} + 120))
    325     y=30
    326    
    327     # re-check x
    328     [ ${x} -ge ${xres} ] && x=30
    329     fi
    330    
    331     case ${i} in
    332     shutdown) name="Herunterfahren" ;;
    333     reboot) name="Neustarten" ;;
    334     esac
    335    
    336     generate_icon \
    337     --name "${name}" \
    338     --command "/usr/lib/alxconfig-ng/bin/user_${i}.sh" \
    339     --icon "${ALX_SESSIONS_ICONS}/${i}.png" \
    340     --dest "${dest}/${i}.lnk" \
    341     --xres "${x}" \
    342     --yres "${y}"
    343    
    344     y=$((${y} + 80))
    345     done
    346    
    347   # last but not least gen a icon with some sys informations   # last but not least gen a icon with some sys informations
    348   local sysinfo   local sysinfo
    349   local hostname   local hostname
    # Line 366  config_sessions() Line 380  config_sessions()
    380   local all_other_ids   local all_other_ids
    381   local CONFIG   local CONFIG
    382   local screensaver_passwd_cmd   local screensaver_passwd_cmd
    383     local fbinit
    384     local fbkeys
    385    
    386   # get all session ids from database   # get all session ids from database
    387   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}'")
    # Line 376  config_sessions() Line 392  config_sessions()
    392   evaluate_table cfg_screensaver   evaluate_table cfg_screensaver
    393   # get autostart settings   # get autostart settings
    394   evaluate_table cfg_autostart   evaluate_table cfg_autostart
    395     # get current color depth
    396     evaluate_table cfg_graphic
    397    
    398   # now setup fluxbox for user station   # now setup fluxbox for user station
    399    
    # Line 386  config_sessions() Line 404  config_sessions()
    404   # now generate fluxbox config files   # now generate fluxbox config files
    405    
    406   # fluxbox main config   # fluxbox main config
    407   cat ${ALX_SKELETONS}/fluxbox/init > ${ALX_UNPRIV_HOME}/.fluxbox/init   if [ -f ${ALX_SKELETONS}/fluxbox/init ]
    408     then
    409     fbinit="${ALX_SKELETONS}/fluxbox/init"
    410     else
    411     fbinit="/usr/share/fluxbox/init"
    412     fi
    413     cat ${fbinit} > ${ALX_UNPRIV_HOME}/.fluxbox/init
    414    
    415   # fluxbox autostart   # fluxbox autostart
    416   CONFIG="${ALX_UNPRIV_HOME}/.fluxbox/apps"   CONFIG="${ALX_UNPRIV_HOME}/.fluxbox/apps"
    417     # do not show decorations on messages generated with xmessage
    418     if [ -x /usr/bin/xmessage ]
    419     then
    420     addconfig '[app] (xmessage)'
    421     addconfig ' [Deco] {NONE}'
    422     addconfig '[end]'
    423     fi
    424   # add icon utility   # add icon utility
    425   [ -x /usr/bin/idesk ] && addconfig '[startup] {nohup idesk > /dev/null &}'   [ -x /usr/bin/idesk ] && addconfig '[startup] {nohup idesk > /dev/null &}'
      [ -x /usr/bin/xtdesk ] && addconfig '[startup] {nohup xtdesk > /dev/null &}'  
    426   # add numlock utility   # add numlock utility
    427   [ -x /usr/bin/numlockx ] && addconfig '[startup] {nohup numlockx on &}'   [ -x /usr/bin/numlockx ] && addconfig '[startup] {nohup numlockx on &}'
    428    
    429   # add screensaver   # add screensaver
    430   if [[ ! -z ${cfg_screensaver_screensaver} ]] && [[ ! -z ${cfg_screensaver_screensaver_timeout} ]]   if [[ ! -z ${cfg_screensaver_screensaver} ]] && [[ ! -z ${cfg_screensaver_screensaver_timeout} ]]
    # Line 417  config_sessions() Line 447  config_sessions()
    447   fi   fi
    448    
    449   # fluxbox hotkeys   # fluxbox hotkeys
    450   cat ${ALX_SKELETONS}/fluxbox/keys > ${ALX_UNPRIV_HOME}/.fluxbox/keys   if [ -f ${ALX_SKELETONS}/fluxbox/keys ]
    451     then
    452     fbkeys="${ALX_SKELETONS}/fluxbox/keys"
    453     else
    454     fbkeys="/usr/share/fluxbox/keys"
    455     fi
    456     cat ${fbkeys} > ${ALX_UNPRIV_HOME}/.fluxbox/keys
    457    
    458   # generate a fluxbox menu   # generate a fluxbox menu
    459   CONFIG="${ALX_UNPRIV_HOME}/.fluxbox/menu"   CONFIG="${ALX_UNPRIV_HOME}/.fluxbox/menu"
    # Line 441  config_sessions() Line 477  config_sessions()
    477   --username "${cfg_sessions_username}" \   --username "${cfg_sessions_username}" \
    478   --password "${cfg_sessions_password}" \   --password "${cfg_sessions_password}" \
    479   --domain "${cfg_sessions_domain}" \   --domain "${cfg_sessions_domain}" \
    480   --server "${cfg_sessions_browseradrs}"   --server "${cfg_sessions_browseradrs}" \
    481     --colordepth "${cfg_graphic_depth}"
    482    
    483   # fluxbox menusession   # fluxbox menusession
    484   addconfig "[exec] (${cfg_sessions_session}) {nice -n 19 wfica ${ALX_ICA_SESSIONS}/$(fix_whitespaces ${cfg_sessions_filename})}"   addconfig "[exec] (${cfg_sessions_session}) {nice -n 19 wfica ${ALX_ICA_SESSIONS}/$(fix_whitespaces ${cfg_sessions_filename})}"
    # Line 491  config_sessions() Line 528  config_sessions()
    528   chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}   chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}
    529   chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}/.fluxbox   chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}/.fluxbox
    530   chmod 0755 ${ALX_UNPRIV_HOME}/.fluxbox   chmod 0755 ${ALX_UNPRIV_HOME}/.fluxbox
    531   chmod 0755 ${ALX_UNPRIV_HOME}/.xtdesktop   chmod 0755 ${ALX_UNPRIV_HOME}/.idesktop
    532   chmod 0644 ${ALX_UNPRIV_HOME}/.xtdeskrc   chmod 0644 ${ALX_UNPRIV_HOME}/.ideskrc
    533  }  }
    Legend:
    Removed from v.2411  
    changed lines
      Added in v.2479