Skip to content

Fix chrome opening on windows when simply loading the system #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Symbolics merged 2 commits into from
Jan 21, 2023
Merged

Fix chrome opening on windows when simply loading the system #21

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d4cfad
Support (and prefer) 64bit Chrome and Firefox on Windows
tobyWorland Jan 20, 2023
7418bee
Fix bug where chrome opens on Windows when simply loading the system
tobyWorland Jan 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions src/plot/browser.lisp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,13 @@
;;; Chrome on Linux
;;;

#-win32
(defun executable-present-p (potential-executable)
"Return T if POTENTIAL-EXECUTABLE responds to --version argument"
(ignore-errors
(zerop (nth-value 2 (uiop:run-program (list potential-executable "--version"))))))

#+linux
(defun find-chrome-executable-linux ()
"Find Chrome's executable for Linux distributions"
;; Linux distributions unfortunately do not all use the same name for chrome,
Expand All @@ -41,16 +43,18 @@
;;;

(defparameter *browser-commands*
(list (cons :chrome #+win32 "C:\\Program Files (x86)\\Google\\Chrome\\Application\\chrome.exe"
(list (cons :chrome #+win32 (find-if #'probe-file (list "C:\\Program Files\\Google\\Chrome\\Application\\chrome.exe"
"C:\\Program Files (x86)\\Google\\Chrome\\Application\\chrome.exe"))
#+(or macos darwin) "/Applications/Google Chrome.app/Contents/MacOS/Google Chrome"
#+linux (find-chrome-executable-linux))
(cons :firefox #+win32 "C:\\Program Files (x86)\\Mozilla Firefox\\firefox.exe"
(cons :firefox #+win32 (find-if #'probe-file (list "C:\\Program Files\\Mozilla Firefox\\firefox.exe"
"C:\\Program Files (x86)\\Mozilla Firefox\\firefox.exe"))
#+(or macos darwin) "/Applications/Firefox.app/Contents/MacOS/firefox"
#+linux "firefox")
(cons :default #+win32 "explorer"
#+(or macos darwin) "open"
#-(or macos darwin win32) "xdg-open")
"Maps browser names to system paths"))
#-(or macos darwin win32) "xdg-open"))
"Maps browser names to system paths")

(defparameter *default-browser-options* nil)

Expand Down Expand Up @@ -114,7 +118,8 @@
;;;

;;; If passing custom options frequently, set these
(defparameter *default-browser-command* (if (executable-present-p (alexandria:assoc-value *browser-commands* :chrome))
(defparameter *default-browser-command* (if #+win32(alexandria:assoc-value *browser-commands* :chrome)
#-win32(executable-present-p (alexandria:assoc-value *browser-commands* :chrome))
:chrome-app-mode
:default))
(defparameter *default-browser-options* (when (eq *default-browser-command* :chrome-app-mode) *default-chrome-app-options*))