Don't use xdg-open if running in terminal mode (i.e. no Xorg)

If the $DISPLAY environment variable is not set, xdg-open should not be
used to load the web browser. Just because it is installed does not mean
that the user exclusively runs in an X session.

Needed for Lynx detection to work around #4170
This commit is contained in:
Mahmoud Al-Qudsi 2017-09-26 13:25:29 -05:00
parent c40188e40e
commit 2b425ad221

View file

@ -55,8 +55,9 @@ function help --description 'Show help for the fish shell'
# If the OS appears to be Windows (graphical), try to use cygstart # If the OS appears to be Windows (graphical), try to use cygstart
if type -q cygstart if type -q cygstart
set fish_browser cygstart set fish_browser cygstart
# If xdg-open is available, just use that # If xdg-open is available, just use that
else if type -q xdg-open # but only if an X session is running
else if type -q xdg-open; and set -q -x DISPLAY
set fish_browser xdg-open set fish_browser xdg-open
end end