Added a 3rd option to browse-url. Now, before defaulting to swing, will try to open the url using an external command if any is configured.

This command is currently defined only for Mac OS X.

1 files changed, 9 insertions, 2 deletions

diff --git a/src/clojure/contrib/javadoc/browse.clj b/src/clojure/contrib/javadoc/browse.clj
index f6b1d349..690a6bf8 100644
--- a/src/clojure/contrib/javadoc/browse.clj
+++ b/src/clojure/contrib/javadoc/browse.clj
@@ -10,7 +10,14 @@
 ;   You must not remove this notice, or any other, from this software.

 

 (ns clojure.contrib.javadoc.browse

-    (:import (java.net URI)))

+  (:require [clojure.contrib.shell-out :as sh]) 

+  (:import (java.net URI)))

+

+(defn- macosx? []

+  (-> "os.name" System/getProperty .toLowerCase

+    (.startsWith "mac os x")))

+

+(def *open-url-script* (when (macosx?) "/usr/bin/open"))

 

 (defn open-url-in-browser

   "Opens url (a string) in the default system web browser.  May not

@@ -45,4 +52,4 @@
       (.show))))

 

 (defn browse-url [url]

-  (or (open-url-in-browser url) (open-url-in-swing url)))

+  (or (open-url-in-browser url) (when *open-url-script* (sh/sh *open-url-script* (str url)) true) (open-url-in-swing url)))