Merge pull request #25 from kepler16/fix/cp-for-root

fix: cp for root
kepler16 · May 21, 2024 · e227392 · e227392
2 parents c619c0a + 4d9057c
commit e227392
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/src/k16/kmono/config.clj b/src/k16/kmono/config.clj
@@ -57,7 +57,9 @@
 (defn- create-config
   [repo-root glob]
   (let [package-dirs (conj (fs/glob repo-root glob)
-                           (fs/absolutize (fs/path repo-root)))]
+                           (-> (fs/path repo-root)
+                               (fs/normalize)
+                               (fs/absolutize)))]
     {:packages (->> package-dirs
                     (map (partial create-package-config repo-root glob))
                     (remove nil?)

diff --git a/src/k16/kmono/repl/deps.clj b/src/k16/kmono/repl/deps.clj
@@ -20,7 +20,9 @@
           {:root root
            :package-dir package-dir
            :path path})
-  (fs/relativize root (fs/path package-dir path)))
+  (if (fs/same-file? root package-dir)
+    (fs/path package-dir path)
+    (fs/relativize root (fs/path package-dir path))))
 
 (defn- strip-extra-parent
   "JRE 8 workaround"
@@ -100,8 +102,11 @@
   (let [package-dirs (->> config
                           :packages
                           (map (fn [pkg]
-                                 [(fs/file-name (fs/path (:dir pkg)))
-                                  (:dir pkg)]))
+                                 [(fs/file-name (fs/normalize
+                                                 (fs/path (:dir pkg))))
+                                  (-> (:dir pkg)
+                                      (fs/normalize)
+                                      (str))]))
                           (into {}))
         package-deps (all-packages-deps-alias (:packages config))
         package-alias-pairs' (expand-package-alias-pairs

diff --git a/test/k16/kmono/test_utils.clj b/test/k16/kmono/test_utils.clj
@@ -47,10 +47,12 @@
 
 (defn shell-commands! [cmds]
   (into {}
-        (map (fn [cmd]
-               [cmd (bp/shell {:dir repo-root
-                               :out :string} cmd)]))
-        cmds))
+        (mapv (fn [cmd]
+                (let [result (bp/shell {:dir repo-root
+                                        :out :string} cmd)]
+                  (Thread/sleep 20)
+                  [cmd result]))
+              cmds)))
 
 (defn initialize-git! []
   (shell-commands! ["git init -q --initial-branch=main"