mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-22 12:32:40 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4615_browser_runtime'

Browse Source 
Signed-off-by: Yury V. Zaytsev <yury@shurup.com>
This commit is contained in:
Yury V. Zaytsev 2024-12-17 09:33:04 +03:00
commit 87ff8568c5
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -213,9 +213,6 @@ if $HAVE_FILECMD; then
fi fi
fi fi
dnl Only list browsers here that can be run in background (i.e. with `&')
AC_CHECK_PROGS(X11_WWW, [gnome-moz-remote mozilla firefox konqueror opera])
dnl ############################################################################ dnl ############################################################################
dnl Check for other tools dnl Check for other tools
@ -608,7 +605,6 @@ misc/ext.d/Makefile
misc/ext.d/doc.sh misc/ext.d/doc.sh
misc/ext.d/misc.sh misc/ext.d/misc.sh
misc/ext.d/text.sh misc/ext.d/text.sh
misc/ext.d/web.sh
misc/macros.d/Makefile misc/macros.d/Makefile
misc/mc.ext.ini misc/mc.ext.ini

9
misc/ext.d/Makefile.am
View File

@ -3,21 +3,20 @@ extdir = $(EXTHELPERSDIR)
SCRIPTS_IN = \ SCRIPTS_IN = \
doc.sh.in \ doc.sh.in \
misc.sh.in \ misc.sh.in \
text.sh.in \ text.sh.in
web.sh.in
SCRIPTS_OUT = \ SCRIPTS_OUT = \
doc.sh \ doc.sh \
misc.sh \ misc.sh \
text.sh \ text.sh
web.sh
SCRIPTS_UNTOUCHED = \ SCRIPTS_UNTOUCHED = \
archive.sh \ archive.sh \
image.sh \ image.sh \
package.sh \ package.sh \
sound.sh \ sound.sh \
video.sh video.sh \
web.sh
ext_SCRIPTS = \ ext_SCRIPTS = \
$(SCRIPTS_UNTOUCHED) \ $(SCRIPTS_UNTOUCHED) \

9
misc/ext.d/web.sh.in → misc/ext.d/web.sh Normal file → Executable file
View File

@ -28,8 +28,13 @@ do_open_action() {
case "${filetype}" in case "${filetype}" in
html) html)
(if [ -n "@X11_WWW@" -a -n "$DISPLAY" ]; then (if [ -n "$DISPLAY" ]; then
(@X11_WWW@ file://"${MC_EXT_CURRENTDIR}"/"${MC_EXT_BASENAME}" &) 1>&2 for browser in gnome-moz-remote mozilla firefox chromium google-chrome konqueror brave-browser opera open ; do
if which "${browser}" 1>&2 ; then
"${browser}" file://"${MC_EXT_CURRENTDIR}"/"${MC_EXT_BASENAME}" 1>&2 &
break
fi
done
else else
elinks "${MC_EXT_FILENAME}" || \ elinks "${MC_EXT_FILENAME}" || \
links "${MC_EXT_FILENAME}" || \ links "${MC_EXT_FILENAME}" || \