Magellan Linux

Diff of /mcore-src/trunk/mcore-tools/daemon/client/include/fluxbox.client.class

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

revision 2013 by niro, Mon Aug 13 10:00:31 2012 UTC revision 2027 by niro, Mon Aug 13 11:37:03 2012 UTC
# Line 10  helper_rebuild_fluxbox_menu() Line 10  helper_rebuild_fluxbox_menu()
10  {  {
11   local MMINCLUDE   local MMINCLUDE
12   local CONFIG   local CONFIG
13     local file
14     local ver
15    
16   MMINCLUDE="${MCORE_CONFIG_PATH}/fluxbox/mcore-menu-include"   MMINCLUDE="${MCORE_CONFIG_PATH}/fluxbox/mcore-menu-include"
17   CONFIG="${MROOT}/${MMINCLUDE}"   CONFIG="${MROOT}/${MMINCLUDE}"
18   clearconfig   clearconfig
19     for file in $(find ${MROOT}/${MCORE_CONFIG_PATH}/fluxbox/menu -type f)
  for file in ${MROOT}/${MCORE_CONFIG_PATH}/fluxbox/menu/*  
20   do   do
21   [[ ! -z ${MROOT} ]] && file=$(echo ${file} | sed "s:${MROOT}::")   [[ ! -z ${MROOT} ]] && file=$(echo ${file} | sed "s:${MROOT}::")
22   addconfig "[include] (${file})"   addconfig "[include] (${file})"
# Line 30  helper_rebuild_fluxbox_menu() Line 31  helper_rebuild_fluxbox_menu()
31    
32   # fluxbox menu header   # fluxbox menu header
33   clearconfig   clearconfig
34   local ver="$(< ${MROOT}/etc/mageversion)"   ver="$(< ${MROOT}/etc/mageversion)"
35   addconfig "[begin] (mCore-${ver}  #${MCORE_SERIAL})"   addconfig "[begin] (${MCORE_DISTRIBUTION}-${ver}  #${MCORE_SERIAL})"
36    
37   # add a newline (maybe there is no crlf in the header)   # add a newline (maybe there is no crlf in the header)
38   addconfig   addconfig
# Line 56  helper_rebuild_fluxbox_autostart() Line 57  helper_rebuild_fluxbox_autostart()
57    
58   CONFIG="${MROOT}/${MCORE_UNPRIV_HOME}/.fluxbox/apps"   CONFIG="${MROOT}/${MCORE_UNPRIV_HOME}/.fluxbox/apps"
59   clearconfig   clearconfig
60   for file in ${MROOT}/${MCORE_CONFIG_PATH}/fluxbox/autostart/*   for file in $(find ${MROOT}/${MCORE_CONFIG_PATH}/fluxbox/autostart -type f)
61   do   do
62   addconfig "$(< ${file})"   addconfig "$(< ${file})"
63   done   done
# Line 111  set_fluxbox_menuitem() Line 112  set_fluxbox_menuitem()
112   elif [[ -z ${name} ]]   elif [[ -z ${name} ]]
113   then   then
114   # delete all items   # delete all items
115   rm ${MROOT}/${MCORE_CONFIG_PATH}/fluxbox/menu/*   find ${MROOT}/${MCORE_CONFIG_PATH}/fluxbox/menu -type f | xargs --no-run-if-empty rm
116   fi   fi
117   ;;   ;;
118   *)   *)
# Line 126  set_fluxbox_menuitem() Line 127  set_fluxbox_menuitem()
127  # get_fluxbox_menuitem  # get_fluxbox_menuitem
128  get_fluxbox_menuitem()  get_fluxbox_menuitem()
129  {  {
130   local i   list_files_in_directory ${MROOT}/${MCORE_CONFIG_PATH}/fluxbox/menu
  local item  
   
  for i in $(find ${MROOT}/${MCORE_CONFIG_PATH}/fluxbox/menu -type f | sort)  
  do  
  item="${item} $(basename ${i})"  
  done  
   
  rvecho "${item}"  
131  }  }
132    
133  help_fluxbox_theme()  help_fluxbox_theme()
# Line 176  get_fluxbox_theme() Line 169  get_fluxbox_theme()
169    
170   case "${method}" in   case "${method}" in
171   system)   system)
172   for i in $(find ${MROOT}/${stylesdir} -mindepth 1 -maxdepth 1 | sort)   list_files_in_directory -type d -mindepth 1 -maxdepth 1 ${MROOT}/${stylesdir}
  do  
  value="${value} $(basename ${i})"  
  done  
  rvecho "${value}"  
173   ;;   ;;
174    
175   current)   current)

Legend:
Removed from v.2013  
changed lines
  Added in v.2027