added imlib2-check so fbgm would prefer *.png over *.xpm when trying to find
icons
This commit is contained in:
parent
83224b7f55
commit
a795d9612c
1 changed files with 20 additions and 3 deletions
|
@ -47,6 +47,13 @@
|
||||||
WHOAMI=`whoami`
|
WHOAMI=`whoami`
|
||||||
[ "$WHOAMI" = root ] && PATH=/bin:/usr/bin/:/usr/local/bin:/usr/X11R6/bin
|
[ "$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
|
# Functions
|
||||||
display_usage() {
|
display_usage() {
|
||||||
cat << EOF
|
cat << EOF
|
||||||
|
@ -146,10 +153,20 @@ append() {
|
||||||
if [ -z "${INSTALL}" ]; then
|
if [ -z "${INSTALL}" ]; then
|
||||||
echo -n " $*" >> ${MENUFILENAME}
|
echo -n " $*" >> ${MENUFILENAME}
|
||||||
execname="`echo $*|cut -d\( -f2|cut -d\) -f1`"
|
execname="`echo $*|cut -d\( -f2|cut -d\) -f1`"
|
||||||
if [ -r "${HOME}/.fluxbox/icons/$execname.xpm" ]; then
|
if [ "${PNG_ICONS}" = "no" ]; then
|
||||||
echo "<${HOME}/.fluxbox/icons/$execname.xpm>" >> ${MENUFILENAME}
|
if [ -r "${HOME}/.fluxbox/icons/$execname.xpm" ]; then
|
||||||
|
echo "<${HOME}/.fluxbox/icons/$execname.xpm>" >> ${MENUFILENAME}
|
||||||
|
else
|
||||||
|
echo >> ${MENUFILENAME}
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
echo >> ${MENUFILENAME}
|
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
|
fi
|
||||||
else
|
else
|
||||||
echo " $*" >> ${MENUFILENAME}
|
echo " $*" >> ${MENUFILENAME}
|
||||||
|
|
Loading…
Reference in a new issue