bb internal scripts: move get-os to its own helper

Author: lread

script/ci_unit_tests.clj

@@ -1,9 +1,9 @@
 #!/usr/bin/env bb
 
 (ns ci-unit-tests
-  (:require [helper.env :as env]
-            [helper.fs :as fs]
+  (:require [helper.fs :as fs]
             [helper.main :as main]
+            [helper.os :as os]
             [helper.shell :as shell]
             [lread.status-line :as status]))
 
@@ -33,7 +33,7 @@
   (shell/command "bb test-shadow-cljs"))
 
 (defn cljs-bootstrap-tests []
-  (if (some #{(env/get-os)} '(:mac :unix))
+  (if (some #{(os/get-os)} '(:mac :unix))
     (shell/command "bb test-cljs --env planck --optimizations none")
     (status/line :warn "skipping planck tests, they can only be run on linux and macOS")) )
 

script/helper/env.clj

@@ -1,19 +1,9 @@
 (ns helper.env
   (:require [clojure.edn :as edn]
-            [clojure.string :as string]
             [helper.shell :as shell]
             [lread.status-line :as status]
             [version-clj.core :as ver]))
 
-(defn get-os []
-  (let [os-name (string/lower-case (System/getProperty "os.name"))]
-    (condp re-find os-name
-      #"win" :win
-      #"mac" :mac
-      #"(nix|nux|aix)" :unix
-      #"sunos" :solaris
-      :unknown)))
-
 (defn- assert-clojure-min-version
   "Asserts minimum version of Clojure version"
   []

script/helper/graal.clj

@@ -1,8 +1,8 @@
 (ns helper.graal
   (:require [clojure.java.io :as io]
             [clojure.string :as string]
-            [helper.env :as env]
             [helper.fs :as fs]
+            [helper.os :as os]
             [helper.shell :as shell]
             [lread.status-line :as status]))
 
@@ -12,10 +12,10 @@
       (fs/at-path (str (io/file (System/getenv "GRAALVM_HOME") "bin")) prog-name)))
 
 (defn find-native-image-prog []
-  (find-graal-prog (if (= :win (env/get-os)) "native-image.cmd" "native-image")))
+  (find-graal-prog (if (= :win (os/get-os)) "native-image.cmd" "native-image")))
 
 (defn find-gu-prog []
-  (find-graal-prog (if (= :win (env/get-os)) "gu.cmd" "gu")))
+  (find-graal-prog (if (= :win (os/get-os)) "gu.cmd" "gu")))
 
 (defn- assert-min-native-image-version [native-image-exe]
   (let [min-major 21

script/helper/os.clj

@@ -0,0 +1,11 @@
+(ns helper.os
+  (:require [clojure.string :as string]))
+
+(defn get-os []
+  (let [os-name (string/lower-case (System/getProperty "os.name"))]
+    (condp re-find os-name
+      #"win" :win
+      #"mac" :mac
+      #"(nix|nux|aix)" :unix
+      #"sunos" :solaris
+      :unknown)))

script/helper/shell.clj

@@ -11,7 +11,8 @@
                                            (with-out-str (pprint/pprint cmd))))})
 
 (defn command
-  "Thin wrapper on babashka.tasks/shell that on error, prints status error message and exits."
+  "Thin wrapper on babashka.tasks/shell that on error, prints status error message and exits.
+  Automatically converts calls to clojure on Windows to call with powershell"
   [cmd & args]
   (let [[opts cmd args] (if (map? cmd)
                           [cmd (first args) (rest args)]

script/test_native.clj

@@ -2,10 +2,10 @@
 
 (ns test-native
   (:require [clojure.java.io :as io]
-            [helper.env :as env]
             [helper.fs :as fs]
             [helper.graal :as graal]
             [helper.main :as main]
+            [helper.os :as os]
             [helper.shell :as shell]
             [lread.status-line :as status]))
 
@@ -37,7 +37,7 @@ Options:
           native-image-xmx "6g"
           target-path "target"
           target-exe "rewrite-clj-test"
-          full-target-exe (str target-path "/" target-exe (when (= :win (env/get-os)) ".exe"))]
+          full-target-exe (str target-path "/" target-exe (when (= :win (os/get-os)) ".exe"))]
       (status/line :head "Creating native image for test")
       (status/line :detail "java -version")
       (shell/command "java -version")

script/test_native_sci.clj

@@ -2,9 +2,9 @@
 
 (ns test-native-sci
   (:require [clojure.java.io :as io]
-            [helper.env :as env]
             [helper.graal :as graal]
             [helper.main :as main]
+            [helper.os :as os]
             [helper.shell :as shell]
             [lread.status-line :as status]))
 
@@ -45,7 +45,7 @@ Options:
           graal-reflection-fname "target/native-image/reflection.json"
           target-path "target"
           target-exe "sci-test-rewrite-clj"
-          full-target-exe (str target-path "/" target-exe (when (= :win (env/get-os)) ".exe"))]
+          full-target-exe (str target-path "/" target-exe (when (= :win (os/get-os)) ".exe"))]
       (status/line :head "Creating native image for testing via sci")
       (status/line :detail "java -version")
       (shell/command "java -version")

script/test_shadow_cljs.clj

@@ -1,8 +1,8 @@
 #!/usr/bin/env bb
 
 (ns test-shadow-cljs
-  (:require [helper.env :as env]
-            [helper.main :as main]
+  (:require [helper.main :as main]
+            [helper.os :as os]
             [helper.shell :as shell]
             [lread.status-line :as status]))
 
@@ -12,7 +12,7 @@
 (defn -main [& args]
   (when (main/doc-arg-opt args)
     (status/line :head "testing ClojureScript source with Shadow CLJS, node, optimizations: none")
-    (shell/command (if (= :win (env/get-os)) "npx.cmd" "npx")
+    (shell/command (if (= :win (os/get-os)) "npx.cmd" "npx")
                    "shadow-cljs" "compile" "test")
     (shell/command "node" compiled-tests))
   nil)