3 files changed, 20 insertions(+), 8 deletions(-)

M main.janet
M src/core.janet
M src/env.janet

@@ 32,13 32,14 @@
                                 :required true}])
 
 (defn main [& args]
+  (env/prepare-paths!)
   (merge-into root-env bagatto)
 
   (let [args (argparse ;argparse-params)
         index (args :default)
         env (prepare-env index)]
     
-    (env/prepare-environment! env)
+    (env/load-env! env)
 
     (if (args "repl")
       # REPL mode: Enter a REPL to experiment with the contents of the

@@ 126,7 126,9 @@
                    _ (error/site-error with-defaults))))]
 
     (let [segments (-> (threads/distribute jobs) (values))]
-      (array/concat ;segments))))
+      (if ((complement empty?) segments)
+        (array/concat ;segments)
+        @[]))))
 
 (defn evaluate-writer-specs
   ```

@@ 1,4 1,5 @@
 (import temple)
+(import path)
 (import sh)
 
 (def required-checks @{})


@@ 25,9 26,9 @@
       false)))
 
 (defn- prepare-syspath! []
-  (match (os/getenv "JANET_PATH")
-    nil :ok
-    janet-path (put root-env :syspath janet-path)))
+  (when-let [janet-path (os/getenv "JANET_PATH")]
+    (array/push module/paths [(path/join janet-path ":all::native:") :native])
+    (put root-env :syspath janet-path)))
 
 (defn add-exec-blacklist
   ```


@@ 42,11 43,19 @@
         (put blacklist check true)))
     (put env :executable-blacklist blacklist)))
 
-(defn prepare-environment!
-  [env]
+(defn prepare-paths!
+  []
   (prepare-syspath!)
-  (temple/add-loader)
+  (temple/add-loader))
+
+(defn load-env!
+  [env]
   # Monkey-patch the temple environment with the functions defined
   # in the index module.
   (merge-into temple/base-env env)
   (setdyn :executable-blacklist (env :executable-blacklist)))
+
+(defn prepare-environment!
+  [env]
+  (prepare-paths!)
+  (load-env! env))