nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bug fix from Han

Browse source
This commit is contained in:
fluxgen 2003-05-22 10:05:37 +00:00
parent 7891106ca3
commit 409e3ca38f
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
util/fluxbox-generate_menu
View file

@ -22,7 +22,7 @@
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE. # DEALINGS IN THE SOFTWARE.
# #
# $Id: fluxbox-generate_menu,v 1.33 2003/05/12 19:55:07 fluxgen Exp $ # $Id: fluxbox-generate_menu,v 1.34 2003/05/22 10:05:37 fluxgen Exp $
# #
# Portability notes: # Portability notes:
@ -594,11 +594,12 @@ if [ -w "${FILENAME}" ]; then
fi fi
# packagedatadir # packagedatadir
PREFIX="${PREFIX:=@PREFIX@}"
if [ ! -d "${PKGDATADIR}" -o -z "${PKGDATADIR}" ]; then if [ ! -d "${PKGDATADIR}" -o -z "${PKGDATADIR}" ]; then
if [ "`uname`" = "Linux" ]; then if [ "$PREFIX" = '@PREFIX@' ]; then
PKGDATADIR=/usr/share
else
PKGDATADIR=/usr/local/share PKGDATADIR=/usr/local/share
else
PKGDATADIR=${PREFIX}/share
fi fi
fi fi
@ -634,7 +635,7 @@ find_it $MY_BROWSER
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
[ -n "$MY_BROWSER" ] && echo "Warning: you chose an invalid browser." >&2 [ -n "$MY_BROWSER" ] && echo "Warning: you chose an invalid browser." >&2
#The precise order is up for debate. #The precise order is up for debate.
for browser in opera skipstone phoenix mozilla galeon konqueror dillo netscape links w3m lynx; do for browser in firebird opera skipstone phoenix mozilla galeon konqueror dillo netscape links w3m lynx; do
if find_it $browser; then if find_it $browser; then
DEFAULT_BROWSER=$browser DEFAULT_BROWSER=$browser
break break
@ -682,9 +683,11 @@ append "[exec] (${DEFAULT_TERM}) {${DEFAULT_TERM}}"
case "$DEFAULT_BROWSER" in case "$DEFAULT_BROWSER" in
links|w3m|lynx) append "[exec] (${DEFAULT_BROWSER}) {${DEFAULT_TERM} -e ${DEFAULT_BROWSER} ${HOMEPAGE}}" ;; links|w3m|lynx) append "[exec] (${DEFAULT_BROWSER}) {${DEFAULT_TERM} -e ${DEFAULT_BROWSER} ${HOMEPAGE}}" ;;
mozilla|phoenix|galeon|dillo|netscape) append "[exec] (${DEFAULT_BROWSER}) {${DEFAULT_BROWSER}}" ;; firebird|mozilla|phoenix|galeon|dillo|netscape) append "[exec] (${DEFAULT_BROWSER}) {${DEFAULT_BROWSER}}" ;;
konqueror) append "[exec] (konqueror) {kfmclient openProfile webbrowsing}" ;; konqueror) append "[exec] (konqueror) {kfmclient openProfile webbrowsing}" ;;
opera) append "[exec] (opera) {env QT_XFT=true opera}" ;; opera) append "[exec] (opera) {env QT_XFT=true opera}" ;;
MozillaFirebird) append "[exec] (firebird) {MozillaFirebird}" ;;
*) append "[exec] (`basename $DEFAULT_BROWSER`) {$DEFAULT_BROWSER}" ;;
esac esac
find_it fbrun append "[exec] (Run) {fbrun}" find_it fbrun append "[exec] (Run) {fbrun}"