Revert "CLJ-2493: Prevent browse-url from hanging when using xdg-open (updated)"

This reverts commit c33a5ab.

Author: puredanger

src/clj/clojure/java/browse.clj

@@ -71,6 +71,6 @@
         script (if (= :uninitialized script)
                  (reset! *open-url-script* (open-url-script-val))
                  script)]
-    (or (when script (sh/launch script (str url)) true)
+    (or (when script (sh/sh script (str url)) true)
         (open-url-in-browser url)
         (open-url-in-swing url))))

src/clj/clojure/java/shell.clj

@@ -127,21 +127,6 @@ collecting its stdout"}
             exit-code (.waitFor proc)]
         {:exit exit-code :out @out :err @err}))))
 
-(defn launch
-  "Same as sh except the I/O channels of the sub-process are ignored.
-
-  Use when you want the sub-process to take an action, but do not want to wait
-  for the I/O channels to close. Example: Launching a browser with xdg-open.
-  "
-  {:added "1.11"}
-  [& args]
-  (let [[cmd opts] (parse-args args)
-        proc (.exec (Runtime/getRuntime)
-               ^"[Ljava.lang.String;" (into-array cmd)
-               (as-env-strings (:env opts))
-               (as-file (:dir opts)))]
-    {:exit (.waitFor proc)}))
-
 (comment
 
 (println (sh "ls" "-l"))
@@ -154,9 +139,4 @@ collecting its stdout"}
 (println (sh "cat" "myimage.png" :out-enc :bytes)) ; reads binary file into bytes[]
 (println (sh "cmd" "/c dir 1>&2"))
 
-(println (launch "touch" "my-test-file"))
-(println (sh "ls" "-l" "my-test-file"))
-(println (launch "rm" "my-test-file"))
-(println (sh "ls" "-l" "my-test-file"))
-
 )