From 5659a3f155f79b97fe28397027f80f3468121635 Mon Sep 17 00:00:00 2001
From: Norayr Chilingarian <norayr@arnet.am>
Date: Thu, 30 Jun 2022 20:51:30 +0400
Subject: [PATCH] changes stabilized

---
 makefile            |  3 ++-
 src/unix/vpkGit.Mod | 18 ++++++++++++++----
 src/vpkConf.Mod     |  3 +++
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/makefile b/makefile
index a58ab0f..ffeb491 100644
--- a/makefile
+++ b/makefile
@@ -11,7 +11,7 @@ DPS = dps
 VIPACK = vipack
 
 
-all: deps
+all: deps vipack
 
 	#git submodule init
 	#git submodule update
@@ -21,6 +21,7 @@ all: deps
 	gmake -f $(mkfile_dir_path)/dps/Internet/makefile BUILD=$(build_dir_path)
 	gmake -f $(mkfile_dir_path)/dps/time/Makefile BUILD=$(build_dir_path)
 	gmake -f $(mkfile_dir_path)/dps/opts/Makefile BUILD=$(build_dir_path)
+vipack:
 	cd $(build_dir_path) && \
 	$(VOC) -s \
 		../src/vpkSettings.Mod \
diff --git a/src/unix/vpkGit.Mod b/src/unix/vpkGit.Mod
index 59be997..7fec876 100644
--- a/src/unix/vpkGit.Mod
+++ b/src/unix/vpkGit.Mod
@@ -1,20 +1,30 @@
 MODULE vpkGit;
 IMPORT Out, Strings, Platform, vpkEnv;
 
-PROCEDURE pull*(url : ARRAY OF CHAR; dst : ARRAY OF CHAR; branch: ARRAY OF CHAR);
+PROCEDURE pull*(VAR url : ARRAY OF CHAR; VAR dst : ARRAY OF CHAR; VAR branch: ARRAY OF CHAR);
 VAR i : INTEGER;
     cmd : ARRAY 2048 OF CHAR;
 BEGIN
-  cmd:= "git init ";
+  cmd := "git init ";
   Strings.Append(dst, cmd);
   i:=Platform.System(cmd);
+  (*cmd := "git -C ";
+  Strings.Append(dst, cmd);
+  Strings.Append(" remote add origin ", cmd);
+  Strings.Append(url, cmd);
+  i:=Platform.System(cmd);*)
   cmd := "";
   cmd := "git -C ";
   Strings.Append(dst, cmd);
   Strings.Append(" pull ", cmd);
   Strings.Append(url, cmd);
-  Strings.Append(" ", cmd);
-  Strings.Append(branch, cmd);
+  Out.String("branch: '"); Out.String(branch); Out.String("'."); Out.Ln;
+  IF branch # "" THEN
+    Out.String("adding branch to commandline"); Out.Ln;
+    Strings.Append(" ", cmd);
+    Strings.Append(branch, cmd);
+  END;
+  Out.String("fetch command: '"); Out.String(cmd); Out.Char("'"); Out.Ln;
   i := Platform.System(cmd);
 END pull;
 
diff --git a/src/vpkConf.Mod b/src/vpkConf.Mod
index 26d7014..88b10c3 100644
--- a/src/vpkConf.Mod
+++ b/src/vpkConf.Mod
@@ -55,6 +55,9 @@ VAR
   treeTyp: ARRAY 8 OF CHAR;
   branch: ARRAY 128 OF CHAR;
 BEGIN
+  COPY("", tree.branch);
+  COPY("", tree.url);
+  COPY("", branch);
   f := vpkEnv.getConfFile();
   Files.Set(r, f, 0);
   i := 0;