Magellan Linux

Diff of /trunk/include/gnome2.minc

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

revision 46 by niro, Fri Apr 27 15:58:19 2012 UTC revision 75 by niro, Tue Sep 2 11:26:21 2014 UTC
# Line 24  gn2_update_gconf() Line 24  gn2_update_gconf()
24   # first update gconf   # first update gconf
25   if [ -x ${MROOT}/usr/bin/gconftool-2 ]   if [ -x ${MROOT}/usr/bin/gconftool-2 ]
26   then   then
27     echo "Searching gconf schemas ..."
28   pushd ${BUILDDIR}/${PKGNAME}/binfiles &> /dev/null   pushd ${BUILDDIR}/${PKGNAME}/binfiles &> /dev/null
29   local schemas=$(find 'etc/gconf/schemas/' -name '*.schemas' 2> /dev/null)   local schemas=$(find 'etc/gconf/schemas/' -name '*.schemas' 2> /dev/null)
30   popd &> /dev/null   popd &> /dev/null
# Line 77  gn2_update_mime_db() Line 78  gn2_update_mime_db()
78    
79  gn2_update_icon_cache()  gn2_update_icon_cache()
80  {  {
81     local icons
82    
83   if [ -x ${MROOT}/usr/bin/gtk-update-icon-cache ]   if [ -x ${MROOT}/usr/bin/gtk-update-icon-cache ]
84   then   then
85   pushd ${BUILDDIR}/${PKGNAME}/binfiles &> /dev/null   if [ -d ${BUILDDIR}/${PKGNAME}/binfiles/usr/share/icons ]
86   local icons=$(find 'usr/share/icons' -maxdepth 1 -mindepth 1 -type d 2> /dev/null)   then
87   popd &> /dev/null   echo "Searching icon directories ..."
88     pushd ${BUILDDIR}/${PKGNAME}/binfiles &> /dev/null
89     icons=$(find 'usr/share/icons' -maxdepth 1 -mindepth 1 -type d 2> /dev/null)
90     popd &> /dev/null
91     else
92     icons="usr/share/icons/hicolor"
93     fi
94    
95   # abort here, if no icons where found   # abort here, if no icons where found
96   [[ -z ${icons} ]] && return   [[ -z ${icons} ]] && return

Legend:
Removed from v.46  
changed lines
  Added in v.75