From 519c0c0c71cdf7ce3dfc64b9781ab826760b3d94 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Mon, 14 Jun 2021 18:33:54 -0400
Subject: Extracted Licentia out of the standard library.

---
 stdlib/source/test/aedifex/command/install.lux | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 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 ce3f21de8..33ee7192d 100644
--- a/stdlib/source/test/aedifex/command/install.lux
+++ b/stdlib/source/test/aedifex/command/install.lux
@@ -16,8 +16,7 @@
     ["." maybe]
     ["." binary]
     ["." text ("#\." equivalence)
-     ["%" format (#+ format)]
-     ["." encoding]]
+     ["%" format (#+ format)]]
     [format
      ["." xml]]
     [collection
@@ -67,13 +66,11 @@
 
 (def: (execute! program fs sample)
   (-> (Program Promise) (file.System Promise) ///.Profile (Promise (Try Text)))
-  (do promise.monad
-    [home (\ program home [])]
-    (do ///action.monad
-      [#let [console (@version.echo "")]
-       _ (..make_sources! fs (get@ #///.sources sample))
-       _ (/.do! console fs (///repository/local.repository program fs) sample)]
-      (!.use (\ console read_line) []))))
+  (do ///action.monad
+    [#let [console (@version.echo "")]
+     _ (..make_sources! fs (get@ #///.sources sample))
+     _ (/.do! console fs (///repository/local.repository program fs) sample)]
+    (!.use (\ console read_line) [])))
 
 (def: #export test
   Test
@@ -91,17 +88,18 @@
                      verdict (do ///action.monad
                                [logging (..execute! program fs sample)
                                 #let [/ uri.separator
-                                      artifact_path (format (///local.uri identity) / (///artifact.identity identity))
+                                      artifact_path (///local.uri (get@ #///artifact.version identity) identity)
                                       library_path (format artifact_path ///artifact/extension.lux_library)
                                       pom_path (format artifact_path ///artifact/extension.pom)]
 
+                                #let [succeeded! (text\= //clean.success logging)]
                                 library_exists! (\ promise.monad map
                                                    exception.return
                                                    (file.file_exists? promise.monad fs library_path))
                                 pom_exists! (\ promise.monad map
                                                exception.return
                                                (file.file_exists? promise.monad fs pom_path))]
-                               (wrap (and (text\= //clean.success logging)
+                               (wrap (and succeeded!
                                           library_exists!
                                           pom_exists!)))]
                     (_.cover' [/.do!]
-- 
cgit v1.2.3