aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2002-05-25 13:42:14 (GMT)
committerfluxgen <fluxgen>2002-05-25 13:42:14 (GMT)
commita4e7d5486e7969ffb301d2d3bfe3758bd9c49b00 (patch)
treeebda653eef8c0e85b4cea654c7953d0eeb7ff07a
parentced3f83baeb74f43945c56b2ce5e8663559afdd4 (diff)
downloadfluxbox-a4e7d5486e7969ffb301d2d3bfe3758bd9c49b00.zip
fluxbox-a4e7d5486e7969ffb301d2d3bfe3758bd9c49b00.tar.bz2
minor fixes
-rwxr-xr-xdata/fluxbox-generate_menu45
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() {
99 99
100menu_entry_dir() { 100menu_entry_dir() {
101 for b in `ls "$*"/*.desktop 2>/dev/null `; do 101 for b in `ls "$*"/*.desktop 2>/dev/null `; do
102 menu_entry "$b" 102 menu_entry "${b}"
103 done 103 done
104} 104}
105 105
@@ -151,7 +151,7 @@ done
151 151
152# menufile name and make a backup 152# menufile name and make a backup
153if [ -z ${FILENAME} ]; then 153if [ -z ${FILENAME} ]; then
154 FILENAME=~/.fluxbox/menu 154 FILENAME=${HOME}/.fluxbox/menu
155fi 155fi
156 156
157if [ ! -z ${FILENAME} ]; then 157if [ ! -z ${FILENAME} ]; then
@@ -173,7 +173,7 @@ fi
173 173
174# Start of menu 174# Start of menu
175 175
176echo "[begin] ($MENUTITLE)" > ${FILENAME} 176echo "[begin] (${MENUTITLE})" > ${FILENAME}
177 177
178find_it xterm append "[exec] (xterm) {xterm -fg white -bg black}" 178find_it xterm append "[exec] (xterm) {xterm -fg white -bg black}"
179find_it nedit append "[exec] (nedit) {nedit}" 179find_it nedit append "[exec] (nedit) {nedit}"
@@ -187,12 +187,15 @@ append_submenu Browsers
187 find_it konqueror append "[exec] (konqueror) {konqueror}" 187 find_it konqueror append "[exec] (konqueror) {konqueror}"
188 find_it links append "[exec] (links) {xterm -title links -fg white -bg black -e links fluxbox.sf.net}" 188 find_it links append "[exec] (links) {xterm -title links -fg white -bg black -e links fluxbox.sf.net}"
189 find_it w3m append "[exec] (w3m) {xterm -title w3m -fg white -bg black -e w3m}" 189 find_it w3m append "[exec] (w3m) {xterm -title w3m -fg white -bg black -e w3m}"
190 find_it lynx append "[exec] (lynx) {xterm -title lynx -fg white -bg black -e lynx}"
191 find_it dillo append "[exec] (dillo) {dillo}"
190append_menu_end 192append_menu_end
191 193
192append_submenu Editors 194append_submenu Editors
193 find_it nedit append "[exec] (nedit) {nedit}" 195 find_it nedit append "[exec] (nedit) {nedit}"
194 find_it vim append "[exec] (vim) {vim -g}" 196 find_it vim append "[exec] (vim) {vim -g}"
195 find_it xemacs append "[exec] (xemacs) {xemacs}" 197 find_it xemacs append "[exec] (xemacs) {xemacs}"
198 find_it emacs append "[exec] (emacs) {emacs}"
196 find_it gedit append "[exec] (gedit) {gedit}" 199 find_it gedit append "[exec] (gedit) {gedit}"
197 find_it xedit append "[exec] (xedit) {xedit}" 200 find_it xedit append "[exec] (xedit) {xedit}"
198 find_it kword append "[exec] (kword) {kword}" 201 find_it kword append "[exec] (kword) {kword}"
@@ -274,13 +277,13 @@ append_submenu X-utils
274append_menu_end 277append_menu_end
275 278
276# gnome menu 279# gnome menu
277if [ -d $PKGDATADIR/gnome/apps ] && [ $GNOMEMENU ]; then 280if [ -d ${PKGDATADIR}/gnome/apps -a "${GNOMEMENU}" ]; then
278 append_submenu Gnome-menus 281 append_submenu Gnome-menus
279 for a in `ls $PKGDATADIR/gnome/apps`; do 282 for a in `ls ${PKGDATADIR}/gnome/apps`; do
280 if [ -d $PKGDATADIR/gnome/apps/"$a" ] ; then 283 if [ -d ${PKGDATADIR}/gnome/apps/"${a}" ] ; then
281 append_submenu "$a" 284 append_submenu "${a}"
282 menu_entry_dir "$PKGDATADIR/gnome/apps/"$a"" 285 menu_entry_dir "${PKGDATADIR}/gnome/apps/"${a}""
283 menu_entry_dircheck "/etc/X11/applnk/"$a"" 286 menu_entry_dircheck "/etc/X11/applnk/"${a}""
284 append_menu_end 287 append_menu_end
285 fi 288 fi
286 done 289 done
@@ -288,23 +291,23 @@ if [ -d $PKGDATADIR/gnome/apps ] && [ $GNOMEMENU ]; then
288fi 291fi
289 292
290# kde submenu 293# kde submenu
291if [ -d $PKGDATADIR/applnk/ ] && [ $KDEMENU ]; then 294if [ -d ${PKGDATADIR}/applnk/ -a "${KDEMENU}" ]; then
292 append_submenu KDE-menus 295 append_submenu KDE-menus
293 for a in `ls $PKGDATADIR/applnk/`; do 296 for a in `ls ${PKGDATADIR}/applnk/`; do
294 if [ -d $PKGDATADIR/applnk/"$a" ]; then 297 if [ -d ${PKGDATADIR}/applnk/"${a}" ]; then
295 append_submenu "$a" 298 append_submenu "${a}"
296 for x in `ls $PKGDATADIR/applnk/"$a"`; do 299 for x in `ls ${PKGDATADIR}/applnk/"${a}"`; do
297 if [ -d $PKGDATADIR/applnk/"$a"/"$x" ]; then 300 if [ -d ${PKGDATADIR}/applnk/"${a}"/"${x}" ]; then
298 append_submenu "$x" 301 append_submenu "${x}"
299 menu_entry_dir $PKGDATADIR/applnk/"$a"/"$x" 302 menu_entry_dir ${PKGDATADIR}/applnk/"${a}"/"${x}"
300 append_menu_end 303 append_menu_end
301 fi 304 fi
302 done 305 done
303 menu_entry_dir $PKGDATADIR/applnk/"$a" 306 menu_entry_dir ${PKGDATADIR}/applnk/"${a}"
304 append_menu_end 307 append_menu_end
305 fi 308 fi
306 done 309 done
307 menu_entry_dir $PKGDATADIR/applnk/ 310 menu_entry_dir ${PKGDATADIR}/applnk/
308 append_menu_end 311 append_menu_end
309fi 312fi
310 313
@@ -313,8 +316,8 @@ append_submenu FB-Settings
313 append "[workspaces] (Workspace List)" 316 append "[workspaces] (Workspace List)"
314 317
315 append_menu "[submenu] (Styles) {Choose a style...}" 318 append_menu "[submenu] (Styles) {Choose a style...}"
316 append "[stylesdir] ($PKGDATADIR/fluxbox/styles)" 319 append "[stylesdir] (${PKGDATADIR}/fluxbox/styles)"
317 append "[stylesdir] (~/.fluxbox/styles)" 320 append "[stylesdir] (${HOME}/.fluxbox/styles)"
318 append_menu_end 321 append_menu_end
319 322
320 append "[config] (Configuration)" 323 append "[config] (Configuration)"