diff options
author | rathnor <rathnor> | 2004-04-25 16:27:28 (GMT) |
---|---|---|
committer | rathnor <rathnor> | 2004-04-25 16:27:28 (GMT) |
commit | 0aae777243b0fab6cdeeae185dda78d4bd210d20 (patch) | |
tree | c5c9d31a8ef6f8ab87fb34488c5b0355387f9b45 | |
parent | 7d74c33ecb7fd4de15df5a74d8819e90a9b3985a (diff) | |
download | fluxbox-0aae777243b0fab6cdeeae185dda78d4bd210d20.zip fluxbox-0aae777243b0fab6cdeeae185dda78d4bd210d20.tar.bz2 |
small fix from Han for rare situation of no terms in path :)
-rwxr-xr-x | util/fluxbox-generate_menu.in | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/util/fluxbox-generate_menu.in b/util/fluxbox-generate_menu.in index 2d7298f..fe196fd 100755 --- a/util/fluxbox-generate_menu.in +++ b/util/fluxbox-generate_menu.in | |||
@@ -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.in,v 1.19 2004/04/04 12:18:48 fluxgen Exp $ | 25 | # $Id: fluxbox-generate_menu.in,v 1.20 2004/04/25 16:27:28 rathnor Exp $ |
26 | 26 | ||
27 | # | 27 | # |
28 | # Portability notes: | 28 | # Portability notes: |
@@ -963,6 +963,17 @@ else | |||
963 | fi | 963 | fi |
964 | done | 964 | done |
965 | fi | 965 | fi |
966 | # a unix system without any terms. that's odd | ||
967 | if [ -z "$DEFAULT_TERM" ]; then | ||
968 | cat << EOF >&2 | ||
969 | |||
970 | Warning: I can't find any terminal-emulators in your PATH. Please fix | ||
971 | your PATH or specify your favourite terminal-emulator with the -t option | ||
972 | |||
973 | EOF | ||
974 | DEFAULT_TERM=xterm | ||
975 | fi | ||
976 | |||
966 | DEFAULT_TERMNAME=`echo $DEFAULT_TERM|awk '{print $1}'` | 977 | DEFAULT_TERMNAME=`echo $DEFAULT_TERM|awk '{print $1}'` |
967 | DEFAULT_TERMNAME=`basename $DEFAULT_TERMNAME` | 978 | DEFAULT_TERMNAME=`basename $DEFAULT_TERMNAME` |
968 | 979 | ||
@@ -984,15 +995,6 @@ DEFAULT_BROWSERNAME=`echo $DEFAULT_BROWSER|awk '{print $1}'` | |||
984 | DEFAULT_BROWSERNAME=`basename $DEFAULT_BROWSERNAME` | 995 | DEFAULT_BROWSERNAME=`basename $DEFAULT_BROWSERNAME` |
985 | 996 | ||
986 | 997 | ||
987 | # a unix system without any terms. that's odd | ||
988 | if [ -z "$DEFAULT_TERM" ]; then | ||
989 | cat << EOF >&2 | ||
990 | Warning: I can't find any terminal-emulators in your PATH. | ||
991 | Please fix your PATH or specify your favourite terminal with the -t option | ||
992 | EOF | ||
993 | fi | ||
994 | |||
995 | |||
996 | # Start of menu | 998 | # Start of menu |
997 | cat << EOF > ${MENUFILENAME} | 999 | cat << EOF > ${MENUFILENAME} |
998 | # Generated by fluxbox-generate_menu | 1000 | # Generated by fluxbox-generate_menu |
@@ -1162,7 +1164,7 @@ append_submenu "${GAMESMENU}" | |||
1162 | gnect mahjongg gnomine gnome-stones gnometris gnotravex \ | 1164 | gnect mahjongg gnomine gnome-stones gnometris gnotravex \ |
1163 | gnotski iagno knights eboard xboard scid freecell pysol \ | 1165 | gnotski iagno knights eboard xboard scid freecell pysol \ |
1164 | gtali tuxracer xpenguins xsnow xeyes xpenguins smclone openmortal \ | 1166 | gtali tuxracer xpenguins xsnow xeyes xpenguins smclone openmortal \ |
1165 | quake2 quake3 skoosh same-gnome enigma xbill icebreaker | 1167 | quake2 quake3 skoosh same-gnome enigma xbill icebreaker scorched3d |
1166 | find_it et append "[exec] (Enemy Territory) {et}" | 1168 | find_it et append "[exec] (Enemy Territory) {et}" |
1167 | find_it ut append "[exec] (Unreal Tournament) {ut}" || \ | 1169 | find_it ut append "[exec] (Unreal Tournament) {ut}" || \ |
1168 | find_it ut2003 append "[exec] (Unreal Tournament 2003) {ut2003}" | 1170 | find_it ut2003 append "[exec] (Unreal Tournament 2003) {ut2003}" |
@@ -1260,7 +1262,7 @@ append_submenu "${FBSETTINGSMENU}" | |||
1260 | 1262 | ||
1261 | append_submenu ${WINDOWMANAGERS} | 1263 | append_submenu ${WINDOWMANAGERS} |
1262 | #hard to properly maintain since there are so many exceptions to the rule. | 1264 | #hard to properly maintain since there are so many exceptions to the rule. |
1263 | for wm in icewm ion kde sawfish enlightenment openbox evilwm waimea xfce pekwm; do | 1265 | for wm in icewm ion kde sawfish enlightenment fvwm openbox evilwm waimea xfce pekwm; do |
1264 | find_it start${wm} append "[restart] (${wm}) {start${wm}}" ||\ | 1266 | find_it start${wm} append "[restart] (${wm}) {start${wm}}" ||\ |
1265 | find_it ${wm} append "[restart] (${wm}) {${wm}}" | 1267 | find_it ${wm} append "[restart] (${wm}) {${wm}}" |
1266 | done | 1268 | done |