From c5b750daba0348f3bc79e9eb98e0ee579010d9b0 Mon Sep 17 00:00:00 2001
From: mane <manehambartsumyan1@gmail.com>
Date: Fri, 3 Apr 2020 01:09:28 +0400
Subject: [PATCH] Vipack.Mod and Opium.Mod merge, Args replaced with Oberon
 module

---
 Vipack.Mod | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/Vipack.Mod b/Vipack.Mod
index 7b7dc2e..5eb6cea 100644
--- a/Vipack.Mod
+++ b/Vipack.Mod
@@ -1,6 +1,7 @@
 MODULE Vipack;
-IMPORT Texts,Strings,In,Platform, Oberon, Out, Files, UserDetails;
+IMPORT vpkLogger, vpkPackageFileParser,Texts,Strings,In,Platform, Oberon, Out, Files, vpkUserDetails;
 
+PROCEDURE  main();
 VAR  user, str, fn: ARRAY 32 OF CHAR;
 	 confDir, string : ARRAY 120 OF CHAR;
      i : INTEGER;
@@ -8,16 +9,33 @@ VAR  user, str, fn: ARRAY 32 OF CHAR;
      r : Files.Rider;
      ch : CHAR;
 	 S: Texts.Scanner;
+	 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;
 
+
+(* Vipack installation or help) *)
+command := S.s;
+IF Strings.Match(command, "") OR Strings.Match(command, "--help")THEN
+	help;
+ELSIF Strings.Match(command, "install") THEN
+	 vpkPackageFileParser.install();
+END;
+
+
 confDir := "/home//.vipack/vipack.conf";
 
 (* Getting username from input if there is no $USER variable *)
-IF ~(UserDetails.GetUsername(user)) THEN
+IF ~(vpkUserDetails.GetUsername(user)) THEN
 	 Out.String("username: "); In.Line(user); 
 END;
 
@@ -37,6 +55,11 @@ ELSIF Files.Old(confDir) # NIL THEN
 END;
 
 Out.String(user); Out.Ln;
+END main;
 
 
+BEGIN
+
+main();
+
 END Vipack.