From 02d27daeacac74785c2b0f4d1ce03d432377a36e Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Tue, 29 Dec 2020 23:29:54 -0400
Subject: Unified repository abstraction for Aedifex.

---
 stdlib/source/test/aedifex/command/install.lux | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'stdlib/source/test/aedifex/command/install.lux')

diff --git a/stdlib/source/test/aedifex/command/install.lux b/stdlib/source/test/aedifex/command/install.lux
index 9df49efa4..ce3f21de8 100644
--- a/stdlib/source/test/aedifex/command/install.lux
+++ b/stdlib/source/test/aedifex/command/install.lux
@@ -26,7 +26,9 @@
     ["." random (#+ Random)]]
    [world
     ["." file (#+ Path File)]
-    ["." program (#+ Program)]]]
+    ["." program (#+ Program)]
+    [net
+     ["." uri]]]]
   [//
    ["@." version]
    [//
@@ -42,7 +44,9 @@
       ["#." pom]
       ["#." local]
       ["#." artifact
-       ["#/." extension]]]]]})
+       ["#/." extension]]
+      ["#." repository #_
+       ["#/." local]]]]]})
 
 (def: (make_sources! fs sources)
   (-> (file.System Promise) (Set Path) (Promise (Try Any)))
@@ -68,9 +72,7 @@
     (do ///action.monad
       [#let [console (@version.echo "")]
        _ (..make_sources! fs (get@ #///.sources sample))
-       _ (: (Promise (Try Path))
-            (file.make_directories promise.monad fs (///local.repository fs home)))
-       _ (/.do! program console fs sample)]
+       _ (/.do! console fs (///repository/local.repository program fs) sample)]
       (!.use (\ console read_line) []))))
 
 (def: #export test
@@ -88,9 +90,8 @@
                            program (program.async (program.mock environment.empty home working_directory))]
                      verdict (do ///action.monad
                                [logging (..execute! program fs sample)
-                                #let [artifact_path (format (///local.path fs home identity)
-                                                            (\ fs separator)
-                                                            (///artifact.identity identity))
+                                #let [/ uri.separator
+                                      artifact_path (format (///local.uri identity) / (///artifact.identity identity))
                                       library_path (format artifact_path ///artifact/extension.lux_library)
                                       pom_path (format artifact_path ///artifact/extension.pom)]
 
-- 
cgit v1.2.3