wip

djblue · Dec 22, 2024 · 0e43618 · 0e43618
1 parent 0457f4e
commit 0e43618
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/portal/runtime/browser.cljc b/src/portal/runtime/browser.cljc
@@ -19,7 +19,8 @@
                      [portal.runtime.fs :as fs]
                      [portal.runtime.json :as json]
                      [portal.runtime.shell :as shell]))
-  #?(:cljr (:import [System.Runtime.InteropServices OSPlatform RuntimeInformation])))
+  #?(:cljr (:import [System.Diagnostics Process]
+                    [System.Runtime.InteropServices OSPlatform RuntimeInformation])))
 
 (defmulti -open (comp :launcher :options))
 
@@ -141,11 +142,11 @@
         (println "Goto" url "to view portal ui."))
       :cljr
       (condp identical? (.Platform Environment/OSVersion)
-        PlatformID/Win32NT      (shell/sh "cmd" "/c" "start" url)
-        PlatformID/Win32Windows (shell/sh "cmd" "/c" "start" url)
+        PlatformID/Win32NT      (prn (Process/Start "explorer" url))
+        PlatformID/Win32Windows (prn (Process/Start "explorer" url))
         PlatformID/Unix         (if (RuntimeInformation/IsOSPlatform OSPlatform/OSX)
-                                  (shell/sh "open" url)
-                                  (shell/sh "xdg-open" url))
+                                  (shell/spawn "open" url)
+                                  (shell/spawn "xdg-open" url))
         (println "Goto" url "to view portal ui.")))))
 
 #?(:clj (defn- random-uuid [] (java.util.UUID/randomUUID)))

diff --git a/src/portal/runtime/shell.cljc b/src/portal/runtime/shell.cljc
@@ -18,7 +18,7 @@
           (.on ps "close" resolve))))
      :cljr
      (future
-       (let [{:keys [exit err out]} (apply shell/sh bin args)]
+       (let [{:keys [exit err out] :as x} (apply shell/sh bin args)]
          (when-not (zero? exit)
            (prn (into [bin] args))
            (println err out))))))