pool/mc
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 111477 from Base:System

Browse Source 
mc x11browser fixes (forwarded request 111216 from subchaser)

OBS-URL: https://build.opensuse.org/request/show/111477
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mc?expand=0&rev=39
This commit is contained in:
Stephan Kulow 2012-03-29 05:45:00 +00:00 committed by Git OBS Bridge
commit 1445795a99
3 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mc-x11browser.diff
View File

@ -8,7 +8,7 @@ Index: misc/mc.ext.in
regex/\.([hH][tT][mM][lL]?)$ regex/\.([hH][tT][mM][lL]?)$
- Open=(if test -n "@X11_WWW@" && test -n "$DISPLAY"; then (@X11_WWW@ file://%d/%p &) 1>&2; else links %f || lynx -force_html %f || ${PAGER:-more} %f; fi) 2>/dev/null - Open=(if test -n "@X11_WWW@" && test -n "$DISPLAY"; then (@X11_WWW@ file://%d/%p &) 1>&2; else links %f || lynx -force_html %f || ${PAGER:-more} %f; fi) 2>/dev/null
- View=%view{ascii} links -dump %f 2>/dev/null || w3m -dump %f 2>/dev/null || lynx -dump -force_html %f - View=%view{ascii} links -dump %f 2>/dev/null || w3m -dump %f 2>/dev/null || lynx -dump -force_html %f
+ Open=/usr/share/mc/bin/x11_browser %f + Open=/usr/share/mc/x11_browser file://%f
+ View=%view{ascii} w3m -dump -T text/html %f; + View=%view{ascii} w3m -dump -T text/html %f;
# StarOffice 5.2 # StarOffice 5.2

8
mc.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Sat Mar 24 08:54:23 UTC 2012 - subchaser1@gmail.com
- x11_browser issues fixed
* use xdg-open if it possible
* HTML-files openning fixed
* firefox & chromium detection added
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Mar 21 06:33:55 UTC 2012 - subchaser1@gmail.com Wed Mar 21 06:33:55 UTC 2012 - subchaser1@gmail.com

9
x11_browser
View File

@ -10,6 +10,10 @@
url="$1" url="$1"
method="${1%%:*}" method="${1%%:*}"
if test -n "$DISPLAY" -a -x /usr/bin/xdg-open ; then
exec /usr/bin/xdg-open "$url"
fi
if test "$url" = "$method" ; then if test "$url" = "$method" ; then
case "${url}" in case "${url}" in
*/*.htm|*/*.html) method=http ;; */*.htm|*/*.html) method=http ;;
@ -41,8 +45,11 @@ case "$method" in
test -n "$DISPLAY" && type -p Netscape >& /dev/null && http=Netscape test -n "$DISPLAY" && type -p Netscape >& /dev/null && http=Netscape
test -n "$DISPLAY" && type -p opera >& /dev/null && http=opera test -n "$DISPLAY" && type -p opera >& /dev/null && http=opera
test -n "$DISPLAY" && type -p mozilla >& /dev/null && http=mozilla test -n "$DISPLAY" && type -p mozilla >& /dev/null && http=mozilla
test -n "$DISPLAY" && type -p firefox >& /dev/null && http=firefox
test -n "$DISPLAY" && type -p chromium >& /dev/null && http=chromium
case "$http" in case "$http" in
[nN]etscape|opera|mozilla) ($http -remote "openURL($url)" || $http "$url") >/dev/null 2>&1 & ;; chromium) $http "$url" >/dev/null 2>&1 & ;;
[nN]etscape|opera|mozilla|firefox) ($http -remote "openURL($url)" || $http "$url") >/dev/null 2>&1 & ;;
lynx|w3m|links) exec $http "$url" ;; lynx|w3m|links) exec $http "$url" ;;
*) *)
echo "No HTTP browser found." echo "No HTTP browser found."