added imlib2-check so fbgm would prefer *.png over *.xpm when trying to find

icons
This commit is contained in:
mathias 2005-01-05 05:57:12 +00:00
parent 83224b7f55
commit a795d9612c

View file

@ -47,6 +47,13 @@
WHOAMI=`whoami`
[ "$WHOAMI" = root ] && PATH=/bin:/usr/bin/:/usr/local/bin:/usr/X11R6/bin
# Check for Imlib2-support
if ( fluxbox -info 2> /dev/null | grep -- -IMLIB ); then
PNG_ICONS="no"
else
PNG_ICONS="yes"
fi
# Functions
display_usage() {
cat << EOF
@ -146,11 +153,21 @@ append() {
if [ -z "${INSTALL}" ]; then
echo -n " $*" >> ${MENUFILENAME}
execname="`echo $*|cut -d\( -f2|cut -d\) -f1`"
if [ "${PNG_ICONS}" = "no" ]; then
if [ -r "${HOME}/.fluxbox/icons/$execname.xpm" ]; then
echo "<${HOME}/.fluxbox/icons/$execname.xpm>" >> ${MENUFILENAME}
else
echo >> ${MENUFILENAME}
fi
else
if [ -r "${HOME}/.fluxbox/icons/$execname.png" ]; then
echo "<${HOME}/.fluxbox/icons/$execname.png>" >> ${MENUFILENAME}
elif [ -r "${HOME}/.fluxbox/icons/$execname.xpm" ]; then
echo "<${HOME}/.fluxbox/icons/$execname.xpm>" >> ${MENUFILENAME}
else
echo >> ${MENUFILENAME}
fi
fi
else
echo " $*" >> ${MENUFILENAME}
fi