Ticket #4615: web.sh - select browser at runtime

Current browser selection happen on compile time and should change to runtime selection. - add chromium browser to list - bonus: remove shellcheck warning Signed-off-by: Andreas Mohr <[email protected]> Signed-off-by: Yury V. Zaytsev <[email protected]>
MidnightCommander · Dec 16, 2024 · f8f220d · f8f220d
1 parent 511d4d8
commit f8f220d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/configure.ac b/configure.ac
@@ -213,9 +213,6 @@ if $HAVE_FILECMD; then
     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 Check for other tools

diff --git a/misc/ext.d/web.sh.in b/misc/ext.d/web.sh.in
@@ -28,8 +28,13 @@ do_open_action() {
 
     case "${filetype}" in
     html)
-        (if [ -n "@X11_WWW@" -a  -n "$DISPLAY" ]; then
-            (@X11_WWW@ file://"${MC_EXT_CURRENTDIR}"/"${MC_EXT_BASENAME}" &) 1>&2
+        (if [ -n "$DISPLAY" ]; then
+            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
             elinks "${MC_EXT_FILENAME}" || \
                 links "${MC_EXT_FILENAME}" || \