From e38cb20d2ce9047e6b0e9bd8fecc780d50245e07 Mon Sep 17 00:00:00 2001 From: Norayr Chilingarian Date: Wed, 19 Jan 2022 04:58:57 +0400 Subject: [PATCH] now builds too! --- src/unix/vpkGit.Mod | 1 - src/vpkInstaller.Mod | 7 +++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/unix/vpkGit.Mod b/src/unix/vpkGit.Mod index bb39058..4170ea5 100644 --- a/src/unix/vpkGit.Mod +++ b/src/unix/vpkGit.Mod @@ -14,7 +14,6 @@ BEGIN Strings.Append(" pull ", cmd); Strings.Append(url, cmd); i := Platform.System(cmd); - Out.Int(i, 0); END pull; PROCEDURE syncTree*(url: ARRAY OF CHAR); diff --git a/src/vpkInstaller.Mod b/src/vpkInstaller.Mod index 666cba9..b9552d3 100644 --- a/src/vpkInstaller.Mod +++ b/src/vpkInstaller.Mod @@ -75,14 +75,13 @@ BEGIN REPEAT k := keys.GetString(keys, j); v := values.GetString(values, j); + srcPath := vpkEnv.getSrcRelPath(dep.name^, v^); + cmd := vpkEnv.mkCmd(k^, srcPath^); + Out.String(cmd^); Out.Ln; res := Platform.Chdir(builddir^); IF res # 0 THEN Out.String("failed to change directory to "); Out.String(builddir^); Out.Ln; Out.String("this should never happen."); Out.Ln; HALT(66); END; - srcPath := vpkEnv.getSrcRelPath(dep.name^, v^); - Out.String(srcPath^); Out.Ln; - cmd := vpkEnv.mkCmd(k^, srcPath^); - Out.String(cmd^); res := Platform.System(cmd^); IF res # 0 THEN Out.String("failed to run build command"); Out.Ln END; INC(j)