From f43db4cbbf9bbcde928daa49ce3fac96be1fa822 Mon Sep 17 00:00:00 2001
From: Camil Staps
Date: Tue, 7 Feb 2017 19:10:34 +0100
Subject: Improved installation

---
 clpm.icl | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'clpm.icl')

diff --git a/clpm.icl b/clpm.icl
index b2fa764..a18c2cc 100644
--- a/clpm.icl
+++ b/clpm.icl
@@ -90,15 +90,15 @@ cmd_install pkg io w
 	= (io <<< fromError solv <<< "\r\n", w)
 # (Ok solv) = solv
 # io = io <<< "Installing dependencies:\r\n"
-# (io,w) = installAll solv io w
-= (io,w)
+= installAll solv io w
 where
 	installAll :: [(Dependency, Version)] *File *World -> *(*File, *World)
 	installAll [] f w = (f,w)
 	installAll [(d,v):ds] f w
-	# f = f <<< "Installing " <<< depName d <<< ":" <<< toString v <<< "...\r\n"
-	# (err,w) = install d v w
+	#! f = f <<< "Installing " <<< depName d <<< ":" <<< toString v <<< "...\r\n"
+	#! (err,w) = install d v w
 	| isError err = (f <<< fromError err <<< "\r\n", w)
+	#! f = f <<< fromOk err <<< "\r\n"
 	= installAll ds f w
 
 cmd_make :: [String] Package *File *World -> *(*File, *World)
@@ -109,9 +109,11 @@ cmd_make opts pkg io w
 | isError ps
 	= (io <<< fromError ps <<< "\r\n", w)
 # ps = fromOk ps
-# (r,w) = syscall (foldl (+) "clm" [" -I " + p \\ p <- ps] +
+# cmd = foldl (+) "clm" [" -I " + p \\ p <- ps] +
 	foldl (+) "" [" " + f \\ f <- optionsToFlags pkg.options ++ opts] +
-	" " + fromJust pkg.main + " -o " + fromJust pkg.main) w
+	" " + fromJust pkg.main + " -o " + fromJust pkg.main
+#! io = io <<< cmd <<< "\r\n"
+#! (r,w) = syscall cmd w
 = (io,w)
 
 parseArgs :: (Arguments [String] -> ([String], Arguments))
-- 
cgit v1.2.3