1 files changed, 24 insertions, 21 deletions

diff --git a/data/fluxbox-generate_menu b/data/fluxbox-generate_menu
index 6f40320..c03699b 100755
--- a/data/fluxbox-generate_menu
+++ b/data/fluxbox-generate_menu
@@ -99,7 +99,7 @@ menu_entry_dircheck() {
 
 menu_entry_dir() {
         for b in `ls "$*"/*.desktop 2>/dev/null `; do
-                menu_entry "$b"
+                menu_entry "${b}"
         done
 }
 
@@ -151,7 +151,7 @@ done
 
 # menufile name and make a backup
 if [ -z ${FILENAME} ]; then
-        FILENAME=~/.fluxbox/menu
+        FILENAME=${HOME}/.fluxbox/menu
 fi
 
 if [ ! -z ${FILENAME} ]; then 
@@ -173,7 +173,7 @@ fi
 
 # Start of menu
 
-echo "[begin] ($MENUTITLE)" > ${FILENAME}
+echo "[begin] (${MENUTITLE})" > ${FILENAME}
 
 find_it xterm           append "[exec]   (xterm) {xterm -fg white -bg black}"
 find_it nedit           append "[exec]   (nedit) {nedit}"
@@ -187,12 +187,15 @@ append_submenu Browsers
         find_it konqueror   append "[exec]   (konqueror) {konqueror}"
         find_it links       append "[exec]   (links) {xterm -title links -fg white -bg black -e links fluxbox.sf.net}"
         find_it w3m         append "[exec]   (w3m) {xterm -title w3m -fg white -bg black -e w3m}"
+        find_it lynx        append "[exec]   (lynx) {xterm -title lynx -fg white -bg black -e lynx}"
+        find_it dillo       append "[exec]   (dillo) {dillo}"
 append_menu_end
 
 append_submenu Editors
         find_it nedit       append "[exec]   (nedit) {nedit}"
         find_it vim         append "[exec]   (vim) {vim -g}"
         find_it xemacs      append "[exec]   (xemacs) {xemacs}"
+        find_it emacs       append "[exec]   (emacs) {emacs}"
         find_it gedit       append "[exec]   (gedit) {gedit}"
         find_it xedit       append "[exec]   (xedit) {xedit}"
         find_it kword       append "[exec]   (kword) {kword}"
@@ -274,13 +277,13 @@ append_submenu X-utils
 append_menu_end
 
 # gnome menu
-if [ -d $PKGDATADIR/gnome/apps ] && [ $GNOMEMENU ]; then
+if [ -d ${PKGDATADIR}/gnome/apps -a "${GNOMEMENU}" ]; then
         append_submenu Gnome-menus
-        for a in `ls $PKGDATADIR/gnome/apps`; do
-                if [ -d $PKGDATADIR/gnome/apps/"$a" ] ; then
-                        append_submenu "$a"
-                        menu_entry_dir "$PKGDATADIR/gnome/apps/"$a""
-                        menu_entry_dircheck "/etc/X11/applnk/"$a""
+        for a in `ls ${PKGDATADIR}/gnome/apps`; do
+                if [ -d ${PKGDATADIR}/gnome/apps/"${a}" ] ; then
+                        append_submenu "${a}"
+                        menu_entry_dir "${PKGDATADIR}/gnome/apps/"${a}""
+                        menu_entry_dircheck "/etc/X11/applnk/"${a}""
                         append_menu_end
                 fi
         done
@@ -288,23 +291,23 @@ if [ -d $PKGDATADIR/gnome/apps ] && [ $GNOMEMENU ]; then
 fi
 
 # kde submenu
-if [ -d $PKGDATADIR/applnk/ ] && [ $KDEMENU ]; then
+if [ -d ${PKGDATADIR}/applnk/ -a "${KDEMENU}" ]; then
         append_submenu KDE-menus
-        for a in `ls $PKGDATADIR/applnk/`; do
-                if [ -d $PKGDATADIR/applnk/"$a" ]; then
-                        append_submenu "$a"
-                        for x in `ls $PKGDATADIR/applnk/"$a"`; do
-                                if [ -d $PKGDATADIR/applnk/"$a"/"$x" ]; then
-                                        append_submenu "$x"
-                                        menu_entry_dir $PKGDATADIR/applnk/"$a"/"$x"
+        for a in `ls ${PKGDATADIR}/applnk/`; do
+                if [ -d ${PKGDATADIR}/applnk/"${a}" ]; then
+                        append_submenu "${a}"
+                        for x in `ls ${PKGDATADIR}/applnk/"${a}"`; do
+                                if [ -d ${PKGDATADIR}/applnk/"${a}"/"${x}" ]; then
+                                        append_submenu "${x}"
+                                        menu_entry_dir ${PKGDATADIR}/applnk/"${a}"/"${x}"
                                         append_menu_end
                                 fi
                         done
-                        menu_entry_dir $PKGDATADIR/applnk/"$a"
+                        menu_entry_dir ${PKGDATADIR}/applnk/"${a}"
                         append_menu_end
                 fi
         done
-        menu_entry_dir $PKGDATADIR/applnk/
+        menu_entry_dir ${PKGDATADIR}/applnk/
         append_menu_end
 fi
 
@@ -313,8 +316,8 @@ append_submenu FB-Settings
         append "[workspaces]   (Workspace List)"
 
         append_menu "[submenu] (Styles) {Choose a style...}"
-                append "[stylesdir] ($PKGDATADIR/fluxbox/styles)"
-                append "[stylesdir] (~/.fluxbox/styles)"
+                append "[stylesdir] (${PKGDATADIR}/fluxbox/styles)"
+                append "[stylesdir] (${HOME}/.fluxbox/styles)"
         append_menu_end
 
         append "[config] (Configuration)"