luciano/babashka
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve clojure.java.browse (#846)

Browse source 
* Remove xdg-open hardcoded path in impl.clojure.java.browse

Binaries in Linux are not guarantee to be located on /usr/bin.

For example, NixOS the binaries are located in
/run/current-system/sw/bin/xdg-open (that is actually just a symlink to
/nix/store). The distro may also not have xdg-open installed at /,
instead the user may put it somewhere else like $HOME/bin.

This commit fixes this by using not hardcoding the PATH of xdg-open,
instead relying on shell path to search it.

* Implement clojure.java.browse/*open-url-script*

This allows usage of a custom URL script, like:

```clojure
(binding [*open-url-script* (atom "my-browse-url-script")]
  (browse-url "https://google.com"))
```

*open-url-script* is an atom just to keep compatibility with Clojure.

Described here: https://clojuredocs.org/clojure.java.browse/*open-url-script*
This commit is contained in:
Thiago Kenji Okada 2021-05-15 17:10:52 -03:00 committed by GitHub
parent e4d5988921
commit 69e58440ab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/babashka/impl/clojure/java/browse.clj
View file

@ -1,7 +1,10 @@
(ns babashka.impl.clojure.java.browse (ns babashka.impl.clojure.java.browse
{:no-doc true} {:no-doc true}
(:require [clojure.java.shell :refer [sh]] (:require [clojure.java.shell :refer [sh]]
[clojure.string :as str])) [clojure.string :as str]
[sci.core :as sci]))
(def open-url-script (sci/new-dynamic-var '*open-url-script* (atom nil)))
(def os (def os
(let [os-name (System/getProperty "os.name") (let [os-name (System/getProperty "os.name")
@ -15,11 +18,13 @@
(defn browse-url [url] (defn browse-url [url]
(let [url (str url)] (let [url (str url)]
(if-let [script (-> open-url-script deref deref)]
(sh script url)
(case os (case os
:mac (sh "/usr/bin/open" url) :mac (sh "/usr/bin/open" url)
:linux (sh "/usr/bin/xdg-open" url) :linux (sh "xdg-open" url)
:windows (sh "cmd" "/C" "start" url)))) :windows (sh "cmd" "/C" "start" url)))))
(def browse-namespace (def browse-namespace
{'browse-url browse-url}) {'*open-url-script* open-url-script
'browse-url browse-url})