From 459e44104bbed1dfaa56d8c59f5129a9477f31c4 Mon Sep 17 00:00:00 2001
From: Edileuton Henrique de Oliveira <eho09@c3sl.ufpr.br>
Date: Tue, 19 Nov 2013 10:09:32 -0200
Subject: [PATCH] windows-installer: Add a code to kill the process of the
previous agent.
Signed-off-by: Edileuton Henrique de Oliveira <eho09@c3sl.ufpr.br>
---
windows-installer/src/installer.nsi | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/windows-installer/src/installer.nsi b/windows-installer/src/installer.nsi
index 973dbc6..af42ba2 100644
--- a/windows-installer/src/installer.nsi
+++ b/windows-installer/src/installer.nsi
@@ -25,7 +25,7 @@
; R3 -> Variable used to set the lock state of the "next" button in INEP page
!define PRODUCT_NAME "ProInfoData"
-!define PRODUCT_VERSION "1.0.0"
+!define PRODUCT_VERSION "1.0.1"
!define PRODUCT_PUBLISHER "C3SL - UFPR"
!define PRODUCT_WEB_SITE "http://seed.c3sl.ufpr.br/"
!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\\
@@ -77,16 +77,12 @@ Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
OutFile "..\build\${PRODUCT_NAME}.exe"
InstallDir "$PROGRAMFILES\${PRODUCT_NAME}"
-Var Dialog
Var Inep
-Var ReturnValue
-Var haveProxyInfo
Var ProxyHost
Var ProxyPort
Var ProxyUser
Var ProxyPass
Var RegInep
-Var InepPointer
;Installer init function
Function .onInit
@@ -125,7 +121,9 @@ Function .onInit
Abort
;Kill proinfodataAgent.exe process
- ;KillProcDLL::KillProc "proinfodataAgent.exe"
+ StrCpy $0 "proinfodataAgent.exe"
+ DetailPrint "Killing all processes called '$0'"
+ KillProc::KillProcesses
;Verify if INEP exists in Windows registry
ClearErrors
@@ -178,9 +176,9 @@ Section "SeçãoPrincipal" SEC01
File "..\..\windows-collect\src\dist\API-MS-Win-Core-ProcessThreads-L1-1-0.dll"
File "..\..\windows-collect\src\dist\API-MS-Win-Security-Base-L1-1-0.dll"
File "..\..\windows-collect\src\dist\bz2.pyd"
- File "..\..\windows-collect\src\dist\KernelBase.dll"
+ ;File "..\..\windows-collect\src\dist\KernelBase.dll"
File "..\..\windows-collect\src\dist\library.zip"
- File "..\..\windows-collect\src\dist\powrprof.dll"
+ ;File "..\..\windows-collect\src\dist\powrprof.dll"
File "..\..\windows-collect\src\dist\proinfodataAgent.exe"
File "..\..\windows-collect\src\dist\pyexpat.pyd"
File "..\..\windows-collect\src\dist\python27.dll"
--
GitLab