Link Here
|
1 |
--- util/fluxbox-generate_menu.in.orig 2012-12-10 18:26:53.000000000 +0100 |
1 |
--- util/fluxbox-generate_menu.in.orig 2015-02-08 10:44:45 UTC |
2 |
+++ util/fluxbox-generate_menu.in 2013-01-02 14:22:14.000000000 +0100 |
2 |
+++ util/fluxbox-generate_menu.in |
3 |
@@ -68,7 +68,7 @@ |
3 |
@@ -68,7 +68,7 @@ Options: |
4 |
-d Other path(s) to recursively search for *.desktop files |
4 |
-d Other path(s) to recursively search for *.desktop files |
5 |
-ds Wider search for *.desktop files (takes more time) |
5 |
-ds Wider search for *.desktop files (takes more time) |
6 |
-i Other path(s) to search for icons |
6 |
-i Other path(s) to search for icons |
Link Here
|
9 |
-is Wider search for icons (worth the extra time) |
9 |
-is Wider search for icons (worth the extra time) |
10 |
-in Skip icon search |
10 |
-in Skip icon search |
11 |
|
11 |
|
12 |
@@ -85,7 +85,7 @@ |
12 |
@@ -85,7 +85,7 @@ Options: |
13 |
Only for packagers: |
13 |
Only for packagers: |
14 |
|
14 |
|
15 |
-p Prefix; default is @PREFIX@ |
15 |
-p Prefix; default is @PREFIX@ |
Link Here
|
18 |
-q KDE-prefix; idem dito |
18 |
-q KDE-prefix; idem dito |
19 |
|
19 |
|
20 |
|
20 |
|
21 |
@@ -145,13 +145,42 @@ |
21 |
@@ -145,13 +145,42 @@ testoption() { |
22 |
esac |
22 |
esac |
23 |
} |
23 |
} |
24 |
|
24 |
|
Link Here
|
67 |
|
67 |
|
68 |
#echo "replaceWithinString: $1, $2, $3" >&2 |
68 |
#echo "replaceWithinString: $1, $2, $3" >&2 |
69 |
#echo ${1//$2/$3} # causes error in BSD even though not used |
69 |
#echo ${1//$2/$3} # causes error in BSD even though not used |
70 |
@@ -203,7 +232,7 @@ |
70 |
@@ -203,7 +232,7 @@ convertIcon(){ |
71 |
if [ -f "${entry_icon}" ]; then |
71 |
if [ -f "${entry_icon}" ]; then |
72 |
: echo "File exists. To overwrite, type: convert \"$1\" \"$entry_icon\"" >&2 |
72 |
: echo "File exists. To overwrite, type: convert \"$1\" \"$entry_icon\"" >&2 |
73 |
else |
73 |
else |
Link Here
|
76 |
convert "$1" "$entry_icon" |
76 |
convert "$1" "$entry_icon" |
77 |
# echo convert "$1" , "$entry_icon" >> $ICONMAPPING |
77 |
# echo convert "$1" , "$entry_icon" >> $ICONMAPPING |
78 |
else |
78 |
else |
79 |
@@ -275,7 +304,7 @@ |
79 |
@@ -275,7 +304,7 @@ doSearch(){ |
80 |
# echo -n "for $temp_icon" |
80 |
# echo -n "for $temp_icon" |
81 |
eval doSearchLoop $USER_ICONPATHS \ |
81 |
eval doSearchLoop $USER_ICONPATHS \ |
82 |
"$FB_ICONDIR" \ |
82 |
"$FB_ICONDIR" \ |
Link Here
|
85 |
${OTHER_ICONPATHS} \ |
85 |
${OTHER_ICONPATHS} \ |
86 |
|
86 |
|
87 |
|
87 |
|
88 |
@@ -558,7 +587,7 @@ |
88 |
@@ -558,7 +587,7 @@ rm -f ${MENUFILENAME}.tmp |
89 |
|
89 |
|
90 |
|
90 |
|
91 |
WHOAMI=`whoami` |
91 |
WHOAMI=`whoami` |
Link Here
|
94 |
|
94 |
|
95 |
# Check for Imlib2-support |
95 |
# Check for Imlib2-support |
96 |
if @pkgprefix@fluxbox@pkgsuffix@@EXEEXT@ -info 2> /dev/null | grep -q "^IMLIB"; then |
96 |
if @pkgprefix@fluxbox@pkgsuffix@@EXEEXT@ -info 2> /dev/null | grep -q "^IMLIB"; then |
97 |
@@ -1271,16 +1300,16 @@ |
97 |
@@ -1271,16 +1300,16 @@ if [ ! "${INSTALL}" = Yes ]; then |
98 |
# These are prefixes; So if fluxbox is installed in @PREFIX@/bin/fluxbox |
98 |
# These are prefixes; So if fluxbox is installed in @PREFIX@/bin/fluxbox |
99 |
# your prefix is: @PREFIX@ |
99 |
# your prefix is: @PREFIX@ |
100 |
|
100 |
|
Link Here
|
115 |
|
115 |
|
116 |
|
116 |
|
117 |
# --- Boolean variables. |
117 |
# --- Boolean variables. |
118 |
@@ -1327,29 +1356,21 @@ |
118 |
@@ -1327,29 +1356,21 @@ while [ $# -gt 0 ]; do |
119 |
-g) GNOMEMENU=yes; shift;; |
119 |
-g) GNOMEMENU=yes; shift;; |
120 |
-in) NO_ICON=yes; shift;; |
120 |
-in) NO_ICON=yes; shift;; |
121 |
-is) OTHER_ICONPATHS=" |
121 |
-is) OTHER_ICONPATHS=" |
Link Here
|
157 |
" |
157 |
" |
158 |
# /usr/share/apps \ |
158 |
# /usr/share/apps \ |
159 |
shift;; |
159 |
shift;; |
160 |
@@ -1420,13 +1441,12 @@ |
160 |
@@ -1420,13 +1441,12 @@ fi |
161 |
# prefix |
161 |
# prefix |
162 |
PREFIX="${PREFIX:=@PREFIX@}" |
162 |
PREFIX="${PREFIX:=@PREFIX@}" |
163 |
if [ -z "${PREFIX}" -o ! -d "${PREFIX}" ]; then |
163 |
if [ -z "${PREFIX}" -o ! -d "${PREFIX}" ]; then |
Link Here
|
173 |
if [ -n "${GNOME_PREFIX}" -a -d "$GNOME_PREFIX/share/gnome" ]; then |
173 |
if [ -n "${GNOME_PREFIX}" -a -d "$GNOME_PREFIX/share/gnome" ]; then |
174 |
break; |
174 |
break; |
175 |
fi |
175 |
fi |
176 |
@@ -1434,7 +1454,7 @@ |
176 |
@@ -1434,7 +1454,7 @@ done |
177 |
# Will remain $PREFIX if all else fails |
177 |
# Will remain $PREFIX if all else fails |
178 |
|
178 |
|
179 |
# kde prefix |
179 |
# kde prefix |
Link Here
|
182 |
if [ -n "${KDE_PREFIX}" -a -d "$KDE_PREFIX/share/applnk" ]; then |
182 |
if [ -n "${KDE_PREFIX}" -a -d "$KDE_PREFIX/share/applnk" ]; then |
183 |
break; |
183 |
break; |
184 |
fi |
184 |
fi |
185 |
@@ -1522,7 +1542,7 @@ |
185 |
@@ -1522,7 +1542,7 @@ if find_it_options $MY_BROWSER; then |
186 |
else |
186 |
else |
187 |
[ -n "$MY_BROWSER" ] && echo "Warning: you chose an invalid browser." >&2 |
187 |
[ -n "$MY_BROWSER" ] && echo "Warning: you chose an invalid browser." >&2 |
188 |
#The precise order is up for debate. |
188 |
#The precise order is up for debate. |
189 |
- for browser in firefox mozilla-firefox mozilla-firebird MozillaFirebird opera skipstone mozilla seamonkey galeon konqueror dillo netscape w3m amaya links lynx; do |
189 |
- for browser in firefox mozilla-firefox chrome chromium google-chrome mozilla-firebird MozillaFirebird opera skipstone mozilla seamonkey galeon konqueror dillo netscape w3m amaya links lynx; do |
190 |
+ for browser in chrome firefox mozilla-firefox mozilla-firebird MozillaFirebird linux-opera opera skipstone mozilla seamonkey galeon konqueror dillo netscape w3m amaya links lynx; do |
190 |
+ for browser in firefox mozilla-firefox chrome chromium google-chrome mozilla-firebird MozillaFirebird linux-opera opera skipstone mozilla seamonkey galeon konqueror dillo netscape w3m amaya links lynx; do |
191 |
if find_it_options $browser; then |
191 |
if find_it_options $browser; then |
192 |
DEFAULT_BROWSER=$browser |
192 |
DEFAULT_BROWSER=$browser |
193 |
break |
193 |
break |
194 |
@@ -1581,9 +1601,10 @@ |
194 |
@@ -1589,6 +1609,7 @@ case "$DEFAULT_BROWSERNAME" in |
195 |
|
195 |
chrome|chromium) append "[exec] (${DEFAULT_BROWSERNAME}) {${DEFAULT_BROWSER}}" ;; |
196 |
case "$DEFAULT_BROWSERNAME" in |
196 |
google-chrome) append "[exec] (${DEFAULT_BROWSERNAME}) {${DEFAULT_BROWSER}}" ;; |
197 |
links|w3m|lynx) append "[exec] (${DEFAULT_BROWSERNAME}) {${DEFAULT_TERM} -e ${DEFAULT_BROWSER} ${HOMEPAGE}}" ;; |
|
|
198 |
- firefox|firebird|mozilla|seamonkey|phoenix|galeon|dillo|netscape|amaya) append "[exec] (${DEFAULT_BROWSERNAME}) {${DEFAULT_BROWSER}}" ;; |
199 |
+ chrome|firefox|firebird|mozilla|seamonkey|phoenix|galeon|dillo|netscape|amaya) append "[exec] (${DEFAULT_BROWSERNAME}) {${DEFAULT_BROWSER}}" ;; |
200 |
konqueror) append "[exec] (konqueror) {kfmclient openProfile webbrowsing}" ;; |
197 |
konqueror) append "[exec] (konqueror) {kfmclient openProfile webbrowsing}" ;; |
201 |
- opera) append "[exec] (opera) {env QT_XFT=true opera}" ;; |
198 |
+ linux-opera) append "[exec] (linux-opera) {env QT_XFT=true linux-opera}" ;; |
202 |
+ linux-opera) append "[exec] (linux-opera) {linux-opera}" ;; |
199 |
opera) append "[exec] (opera) {env QT_XFT=true opera}" ;; |
203 |
+ opera) append "[exec] (opera) {opera}" ;; |
|
|
204 |
MozillaFirebird) append "[exec] (firebird) {MozillaFirebird}" ;; |
200 |
MozillaFirebird) append "[exec] (firebird) {MozillaFirebird}" ;; |
205 |
MozillaFirefox) append "[exec] (firefox) {MozillaFirefox}" ;; |
201 |
MozillaFirefox) append "[exec] (firefox) {MozillaFirefox}" ;; |
206 |
*) append "[exec] ($DEFAULT_BROWSERNAME) {$DEFAULT_BROWSER}" ;; |
202 |
@@ -1608,6 +1629,7 @@ append_submenu "${NETMENU}" |
207 |
@@ -1600,9 +1621,10 @@ |
|
|
208 |
|
209 |
append_submenu "${NETMENU}" |
210 |
append_submenu "${BROWSERMENU}" |
203 |
append_submenu "${BROWSERMENU}" |
211 |
- normal_find firefox mozilla-firefox MozillaFirefox galeon mozilla seamonkey dillo netscape vncviewer |
204 |
normal_find chrome chromium firefox google-chrome mozilla-firefox MozillaFirefox galeon mozilla seamonkey dillo netscape vncviewer |
212 |
+ normal_find chrome firefox mozilla-firefox MozillaFirefox galeon mozilla seamonkey dillo netscape vncviewer |
|
|
213 |
find_it links append "[exec] (links-graphic) {links -driver x ${HOMEPAGE}}" |
205 |
find_it links append "[exec] (links-graphic) {links -driver x ${HOMEPAGE}}" |
214 |
- find_it opera append "[exec] (opera) {env QT_XFT=true opera}" |
206 |
+ find_it linux-opera append "[exec] (linux-opera) {env QT_XFT=true opera}" |
215 |
+ find_it linux-opera append "[exec] (linux-opera) {linux-opera}" |
207 |
find_it opera append "[exec] (opera) {env QT_XFT=true opera}" |
216 |
+ find_it opera append "[exec] (opera) {opera}" |
|
|
217 |
find_it konqueror append "[exec] (konqueror) {kfmclient openProfile webbrowsing}" |
208 |
find_it konqueror append "[exec] (konqueror) {kfmclient openProfile webbrowsing}" |
218 |
find_it links append "[exec] (links) {${DEFAULT_TERM} -e links ${HOMEPAGE}}" |
209 |
find_it links append "[exec] (links) {${DEFAULT_TERM} -e links ${HOMEPAGE}}" |
219 |
find_it w3m append "[exec] (w3m) {${DEFAULT_TERM} -e w3m ${HOMEPAGE}}" |
|
|