fs, configFile, treeDir change

Vipack.Mod

@@ -1,42 +1,43 @@
 MODULE Vipack;
-IMPORT  vpkConf, vpkFsHelper, vpkLogger, vpkPackageFileParser, Texts, Strings, In, Platform, Oberon, Out, Files, vpkUserDetails;
+IMPORT  vpkConf, vpkLogger, vpkPackageFileParser, Texts, Strings, In, Platform, Oberon, Out, Files, vpkUserDetails;
 
 PROCEDURE  main();
 
-CONST confFileName = "/vipack.conf";
+CONST confFileName = "vipack.conf";
+CONST syncDirName = "tree/";
 
-VAR  user, str, fn: ARRAY 32 OF CHAR;
+VAR  user, str: ARRAY 32 OF CHAR;
-	 confPath, string : ARRAY 120 OF CHAR;
+	 confPath, curPath, string : ARRAY 120 OF CHAR;
      i : INTEGER;
      f : Files.File;
      r : Files.Rider;
      ch : CHAR;
 	 S: Texts.Scanner;
-	 command : ARRAY 500 OF CHAR;
+	 defaultUrl,project,command : ARRAY 500 OF CHAR;
 
 PROCEDURE help();
 BEGIN
 	vpkLogger.Log("HelpText");
 END help;
 
+
 BEGIN
 (* Getting 1 argument and outputting it *)
 Texts.OpenScanner(S, Oberon.Par.text, Oberon.Par.pos);
 Texts.Scan(S);
 Out.String(S.s); Out.Ln;
 
+defaultUrl := "https://github.com/PizzaPablo666/test";
 
-(* Vipack installation or help *)
 command := S.s;
+
+confPath := "/home//.vipack/";
+
+(*HELP*)
 IF Strings.Match(command, "") OR Strings.Match(command, "--help")THEN
 	help;
-ELSIF Strings.Match(command, "install") THEN
-	 vpkPackageFileParser.install();
 END;
 
-
-confPath := "/home//.vipack";
-
 (* Getting username from input if there is no $USER variable *)
 IF ~(vpkUserDetails.GetUsername(user)) THEN
 	 Out.String("username: "); In.Line(user); 
@@ -45,22 +46,56 @@ END;
 (* Making the full path to vipack.conf *)
 Strings.Insert(user,6,confPath);
 Out.String(confPath);Out.Ln;
+curPath := confPath;
 
 (* Checking if ~/.vipack directory already exists *)
-IF ~(vpkFsHelper.mkDir(confPath)) THEN 
+IF vpkConf.makeDir(confPath) THEN 
-	Out.String(confPath); Out.String(" already exists or path is wrong");Out.Ln;
+	Out.String("Creating directory "); Out.String(confPath);Out.Ln;
-ELSE Out.String("Creating directory "); Out.String(confPath);Out.Ln;
+ELSE Out.String(confPath); Out.String(" already exists or path is wrong");Out.Ln;
 END;
 
 (* Checking if vipack.conf already exists *)
-Strings.Append(confFileName,confPath);
+Strings.Append(confFileName,curPath);
 
-IF ~(vpkConf.confExists(confPath)) THEN
+IF ~(vpkConf.confExists(curPath)) THEN
 	Out.String("Creating the configuration file "); Out.String(confPath);Out.Ln;
-		vpkConf.makeConf(confPath);
+	vpkConf.makeConf(curPath,f);
+	Files.Set(r, f, 0);
+	Files.WriteInt(r, 8); Files.WriteString(r, " PATH :"); Files.WriteString(r,defaultUrl);
+	Files.Close(f);
 ELSE 
 	Out.String("File already exists");Out.Ln;
 END;
+(*after adding file and working with it, then removing the file part in the path *)
+curPath := confPath;
+
+
+(*ELSIF Strings.Match(command, "install") THEN
+	 vpkPackageFileParser.install();
+END;*)
+
+
+
+IF command = "sync" THEN
+	Strings.Append(syncDirName, curPath);
+	(*Check tree directory if doesn't exist create*)
+	IF vpkConf.makeDir(curPath) THEN
+		Out.String("Creating "); Out.String(curPath); Out.String("for syncing");Out.Ln;
+	ELSE Out.String("Some error occured or directory already exist");
+	END;
+	(*Sync*)
+	(*git.sync();*)
+END;
+
+
+
+IF command = "install" THEN
+	Texts.Scan(S);
+	project := S.s;
+	Out.String(project);Out.Ln;
+END;
+
+
 
 Out.String(user); Out.Ln;
 END main;

makefile

@@ -15,45 +15,48 @@ copy-version-file-to-build-dir:
 all: http
 	cd builds && \
 	$(VOC) -s \
-		../Settings.Mod \
+		../vpkFsHelper.Mod \
-		../time.Mod \
+		../vpkConf.Mod \
-		../logger.Mod \
+		../vpkUserDetails.Mod \
+		../vpkSettings.Mod \
+		../vpkTime.Mod \
+		../vpkLogger.Mod \
 		../diaspora2hugo/src/lists/Sys.Mod \
 		../diaspora2hugo/src/lists/List.Mod \
 		../diaspora2hugo/src/lists/strutils.Mod \
-		../CharacterStack.Mod \
+		../vpkCharacterStack.Mod \
-		../JsonParser.Mod \
+		../vpkJsonParser.Mod \
-		../FileManager.Mod \
+		../vpkFileManager.Mod \
-		../PackageResolver.Mod \
+		../vpkPackageResolver.Mod \
-		../DependencyResolver.Mod \
+		../vpkDependencyResolver.Mod \
-		../PackageFileParser.Mod \
+		../vpkPackageFileParser.Mod \
-		../opium.Mod -m
+		../Vipack.Mod -m
 
 
 run:
-	./builds/opium install
+	./builds/Vipack install
 
 
 http: clean
 	cd builds && \
-		$(VOC) -s ../time.Mod \
+		$(VOC) -s ../vpkTime.Mod \
-			../logger.Mod \
+			../vpkLogger.Mod \
-			../types.Mod \
+			../vpkTypes.Mod \
-			../sockets.Mod \
+			../vpkSockets.Mod \
-			../netdb.Mod \
+			../vpkNetdb.Mod \
-			../Internet.Mod \
+			../vpkInternet.Mod \
-			../http.Mod
+			../vpkHttp.Mod
 
 json:
 	cd builds && \
 		$(VOC) -s \
-			../time.Mod \
+			../vpkTime.Mod \
-			../logger.Mod \
+			../vpkLogger.Mod \
 			../diaspora2hugo/src/lists/Sys.Mod \
 			../diaspora2hugo/src/lists/List.Mod \
 			../diaspora2hugo/src/lists/strutils.Mod \
-			../CharacterStack.Mod \
+			../vpkCharacterStack.Mod \
-			../JsonParser.Mod
+			../vpkJsonParser.Mod
 
 clean:
 		rm -r builds &