0.10

wpkg · Oct 11, 2017 · c8fdadd · c8fdadd
1 parent cc5e172
commit c8fdadd
Show file tree

Hide file tree

Showing 18 changed files with 27 additions and 31 deletions.
diff --git a/Images/ApplicationFolder/wpkginst.exe b/Images/ApplicationFolder/wpkginst.exe
diff --git a/Images/Setup/WPKGSetup.msi b/Images/Setup/WPKGSetup.msi
diff --git a/Images/Setup/setup.bat b/Images/Setup/setup.bat
@@ -1,4 +1 @@
-setup /i PATH=PATH FILE=FILE PATHUSER=PATHUSER PATHPASSWORD=PATHPASSWORD EXECUSER=EXECUSER EXECPASSWORD=EXECPASSWORD PARAMETERS=PARAMETERS SILENT=NO
-SCRIPTVARNAME1=TOMEK SCRIPTVARVALUE1=EXAMPLEVARIALBE
-
-
+setup /i /quiet SCRIPTVARNAME1="TOMEK ROMEK i ATOMEK" PATH=PATH FILE=FILE PATHUSER=PATHUSER PATHPASSWORD=PATHPASSWORD EXECUSER=EXECUSER EXECPASSWORD=EXECPASSWORD PARAMETERS="TWO PARAMETERS" SILENT="YES" SCRIPTVARVALUE1="EXAMPLE VARIALBE TEST NUMBER ONE"
diff --git a/Sources/Components/vssver.scc b/Sources/Components/vssver.scc
diff --git a/Sources/MainService/WPKGSrv.ncb b/Sources/MainService/WPKGSrv.ncb
diff --git a/Sources/MainService/WPKGSrv.suo b/Sources/MainService/WPKGSrv.suo
diff --git a/Sources/MainService/mssccprj.scc b/Sources/MainService/mssccprj.scc
@@ -2,8 +2,8 @@ SCC = This is a Source Code Control file
 
 [WPKGSrv.sln]
 SCC_Aux_Path = "F:\VSSProjects"
-SCC_Project_Name = "$/WPKG/MainService", AJAAAAAA
+SCC_Project_Name = "$/WPKG/MainService", DLAAAAAA
 
 [WPKGSrv.vcproj]
 SCC_Aux_Path = "F:\VSSProjects"
-SCC_Project_Name = "$/WPKG/MainService", AJAAAAAA
+SCC_Project_Name = "$/WPKG/MainService", DLAAAAAA
diff --git a/Sources/MainService/vssver.scc b/Sources/MainService/vssver.scc
diff --git a/Sources/WPKGSetup/WPKGSetup.suo b/Sources/WPKGSetup/WPKGSetup.suo
diff --git a/Sources/WPKGSetup/mssccprj.scc b/Sources/WPKGSetup/mssccprj.scc
@@ -2,8 +2,8 @@ SCC = This is a Source Code Control file
 
 [WPKGSetup.sln]
 SCC_Aux_Path = "F:\VSSProjects"
-SCC_Project_Name = "$/WPKG/WPKGSetup", IKAAAAAA
+SCC_Project_Name = "$/WPKG/WPKGSetup", INAAAAAA
 
 [WPKGSetup.vdproj]
 SCC_Aux_Path = "F:\VSSProjects"
-SCC_Project_Name = "$/WPKG/WPKGSetup", IKAAAAAA
+SCC_Project_Name = "$/WPKG/WPKGSetup", INAAAAAA
diff --git a/Sources/WPKGSetup/vssver.scc b/Sources/WPKGSetup/vssver.scc
diff --git a/Sources/wpkginst/mssccprj.scc b/Sources/wpkginst/mssccprj.scc
@@ -2,8 +2,8 @@ SCC = This is a Source Code Control file
 
 [wpkginst.sln]
 SCC_Aux_Path = "F:\VSSProjects"
-SCC_Project_Name = "$/WPKG/wpkginst", RJAAAAAA
+SCC_Project_Name = "$/WPKG/wpkginst", TLAAAAAA
 
 [wpkginst.vcproj]
 SCC_Aux_Path = "F:\VSSProjects"
-SCC_Project_Name = "$/WPKG/wpkginst", RJAAAAAA
+SCC_Project_Name = "$/WPKG/wpkginst", TLAAAAAA
diff --git a/Sources/wpkginst/res/vssver.scc b/Sources/wpkginst/res/vssver.scc
diff --git a/Sources/wpkginst/vssver.scc b/Sources/wpkginst/vssver.scc
diff --git a/Sources/wpkginst/wpkginst.cpp b/Sources/wpkginst/wpkginst.cpp
@@ -67,6 +67,7 @@ BOOL CWpkgInstApp::InitInstance()
 
 	//TODO: kasowanie = usuñ
 	//s.DeleteSecret();
+	//AfxMessageBox(m_lpCmdLine);
 	/////////////////////////
 
 	BOOL bSilent = FALSE;
@@ -84,29 +85,26 @@ BOOL CWpkgInstApp::InitInstance()
 	}
 
 
-	if(!bSilent)
+	if(s.LoadSecret())
 	{
-		if(s.LoadSecret())
-		{
-			s.m_strScriptPath = param.GetParameter("path");
-			s.m_strScriptFile = param.GetParameter("file");
-			if(s.m_strScriptFile.IsEmpty())
-				s.m_strScriptFile = "wpkg.js";
-			s.m_strScriptParameters = param.GetParameter("parameters");
-			if(s.m_strScriptParameters.IsEmpty())
-				s.m_strScriptParameters = " /synchronize /nonotify /quiet";
-			s.m_strScriptConnUser = param.GetParameter("PathUser");
-			s.m_strScriptConnPassword = param.GetParameter("PathPassword");
-			s.m_strScriptExecUser = param.GetParameter("ExecUser");
-			if(s.m_strScriptExecUser.IsEmpty())
-				s.m_strScriptExecUser = "SYSTEM";
-			s.m_strScriptExecPassword = param.GetParameter("execpassword");
-			s.m_strScriptVarName1 = param.GetParameter("ScriptVarName1");
-			s.m_strScriptVarValue1 = param.GetParameter("ScriptVarValue1");
-
-		}
+		s.m_strScriptPath = param.GetParameter("path");
+		s.m_strScriptFile = param.GetParameter("file");
+		if(s.m_strScriptFile.IsEmpty())
+			s.m_strScriptFile = "wpkg.js";
+		s.m_strScriptParameters = param.GetParameter("parameters");
+		if(s.m_strScriptParameters.IsEmpty())
+			s.m_strScriptParameters = " /synchronize /nonotify /quiet";
+		s.m_strScriptConnUser = param.GetParameter("PathUser");
+		s.m_strScriptConnPassword = param.GetParameter("PathPassword");
+		s.m_strScriptExecUser = param.GetParameter("ExecUser");
+		if(s.m_strScriptExecUser.IsEmpty())
+			s.m_strScriptExecUser = "SYSTEM";
+		s.m_strScriptExecPassword = param.GetParameter("execpassword");
+		s.m_strScriptVarName1 = param.GetParameter("ScriptVarName1");
+		s.m_strScriptVarValue1 = param.GetParameter("ScriptVarValue1");
+
 	}
-	
+
 
 	CWpkgInstDlg dlg;
 	dlg.m_strScriptPath = s.m_strScriptPath;

diff --git a/Sources/wpkginst/wpkginst.ncb b/Sources/wpkginst/wpkginst.ncb
diff --git a/Sources/wpkginst/wpkginst.suo b/Sources/wpkginst/wpkginst.suo
diff --git a/Sources/wpkginst/wpkginstDlg.cpp b/Sources/wpkginst/wpkginstDlg.cpp
@@ -11,6 +11,7 @@
 #define new DEBUG_NEW
 #endif
 
+#pragma warning(disable : 4996)
 
 // CWpkgInstDlg dialog