aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-05-22 10:05:37 (GMT)
committerfluxgen <fluxgen>2003-05-22 10:05:37 (GMT)
commit409e3ca38fd706dde49bea1fb3efa32fee5a8056 (patch)
tree1d267701446940b8e5133a3e7e434f06bca3da15
parent7891106ca38096a5c738394cc6252b503de1ea75 (diff)
downloadfluxbox_pavel-409e3ca38fd706dde49bea1fb3efa32fee5a8056.zip
fluxbox_pavel-409e3ca38fd706dde49bea1fb3efa32fee5a8056.tar.bz2
bug fix from Han
-rwxr-xr-xutil/fluxbox-generate_menu15
1 files changed, 9 insertions, 6 deletions
diff --git a/util/fluxbox-generate_menu b/util/fluxbox-generate_menu
index ace2290..161cd32 100755
--- a/util/fluxbox-generate_menu
+++ b/util/fluxbox-generate_menu
@@ -22,7 +22,7 @@
22# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23# DEALINGS IN THE SOFTWARE. 23# DEALINGS IN THE SOFTWARE.
24# 24#
25# $Id: fluxbox-generate_menu,v 1.33 2003/05/12 19:55:07 fluxgen Exp $ 25# $Id: fluxbox-generate_menu,v 1.34 2003/05/22 10:05:37 fluxgen Exp $
26 26
27# 27#
28# Portability notes: 28# Portability notes:
@@ -594,11 +594,12 @@ if [ -w "${FILENAME}" ]; then
594fi 594fi
595 595
596# packagedatadir 596# packagedatadir
597PREFIX="${PREFIX:=@PREFIX@}"
597if [ ! -d "${PKGDATADIR}" -o -z "${PKGDATADIR}" ]; then 598if [ ! -d "${PKGDATADIR}" -o -z "${PKGDATADIR}" ]; then
598 if [ "`uname`" = "Linux" ]; then 599 if [ "$PREFIX" = '@PREFIX@' ]; then
599 PKGDATADIR=/usr/share
600 else
601 PKGDATADIR=/usr/local/share 600 PKGDATADIR=/usr/local/share
601 else
602 PKGDATADIR=${PREFIX}/share
602 fi 603 fi
603fi 604fi
604 605
@@ -634,7 +635,7 @@ find_it $MY_BROWSER
634if [ $? -ne 0 ]; then 635if [ $? -ne 0 ]; then
635 [ -n "$MY_BROWSER" ] && echo "Warning: you chose an invalid browser." >&2 636 [ -n "$MY_BROWSER" ] && echo "Warning: you chose an invalid browser." >&2
636 #The precise order is up for debate. 637 #The precise order is up for debate.
637 for browser in opera skipstone phoenix mozilla galeon konqueror dillo netscape links w3m lynx; do 638 for browser in firebird opera skipstone phoenix mozilla galeon konqueror dillo netscape links w3m lynx; do
638 if find_it $browser; then 639 if find_it $browser; then
639 DEFAULT_BROWSER=$browser 640 DEFAULT_BROWSER=$browser
640 break 641 break
@@ -682,9 +683,11 @@ append "[exec] (${DEFAULT_TERM}) {${DEFAULT_TERM}}"
682 683
683case "$DEFAULT_BROWSER" in 684case "$DEFAULT_BROWSER" in
684 links|w3m|lynx) append "[exec] (${DEFAULT_BROWSER}) {${DEFAULT_TERM} -e ${DEFAULT_BROWSER} ${HOMEPAGE}}" ;; 685 links|w3m|lynx) append "[exec] (${DEFAULT_BROWSER}) {${DEFAULT_TERM} -e ${DEFAULT_BROWSER} ${HOMEPAGE}}" ;;
685 mozilla|phoenix|galeon|dillo|netscape) append "[exec] (${DEFAULT_BROWSER}) {${DEFAULT_BROWSER}}" ;; 686 firebird|mozilla|phoenix|galeon|dillo|netscape) append "[exec] (${DEFAULT_BROWSER}) {${DEFAULT_BROWSER}}" ;;
686 konqueror) append "[exec] (konqueror) {kfmclient openProfile webbrowsing}" ;; 687 konqueror) append "[exec] (konqueror) {kfmclient openProfile webbrowsing}" ;;
687 opera) append "[exec] (opera) {env QT_XFT=true opera}" ;; 688 opera) append "[exec] (opera) {env QT_XFT=true opera}" ;;
689 MozillaFirebird) append "[exec] (firebird) {MozillaFirebird}" ;;
690 *) append "[exec] (`basename $DEFAULT_BROWSER`) {$DEFAULT_BROWSER}" ;;
688esac 691esac
689 692
690find_it fbrun append "[exec] (Run) {fbrun}" 693find_it fbrun append "[exec] (Run) {fbrun}"