From 04531531dd262e16fa608a37f251a6704cd590a9 Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Tue, 1 Dec 2015 19:04:49 +0100
Subject: [PATCH] Uninstall service before upgrade/Downgrade/remove

---
 packages/zabbix_agent.xml | 36 ++++++++++++++++++++++++------------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/packages/zabbix_agent.xml b/packages/zabbix_agent.xml
index 9eab936..f6c3620 100644
--- a/packages/zabbix_agent.xml
+++ b/packages/zabbix_agent.xml
@@ -2,7 +2,7 @@
 <packages>
     <package id="zabbix_agent"
              name="Agent de supervision Zabbix"
-             revision="16"
+             revision="17"
              priority="10"> 
 
         <variable name="PKG_VERSION" value="2.4.7.1" />
@@ -13,22 +13,34 @@
 
         <install cmd='msiexec /qn /i "%MSI%" SERVER=%ZBX_SERVER_IP% RMTCMD=0' />
         <install cmd='netsh firewall add portopening TCP 10050 "Zabbix Agent" enable custom "%ZBX_SERVER_IP%"' />
-        <install cmd='%COMSPEC% /C sc start "Zabbix Agent"'>
-            <exit code="any" />
-        </install>
 
-        <upgrade cmd='%COMSPEC% /C sc stop "Zabbix Agent"'>
-            <exit code="any" />
-        </upgrade>        
+        <upgrade cmd='"%PROGRAMFILES%\Zabbix Agent\zabbix_agentd.exe" -c "%PROGRAMFILES%\Zabbix Agent\zabbix_agentd.conf" --stop'>
+            <exit code="1" />
+            <exit code="0" />
+        </upgrade>
+        <upgrade cmd='"%PROGRAMFILES%\Zabbix Agent\zabbix_agentd.exe" -c "%PROGRAMFILES%\Zabbix Agent\zabbix_agentd.conf" --uninstall'>
+            <exit code="1" />
+            <exit code="0" />
+        </upgrade>
         <upgrade include="install" />
 
-        <downgrade cmd='%COMSPEC% /C sc stop "Zabbix Agent"'>
-            <exit code="any" />
+        <downgrade cmd='"%PROGRAMFILES%\Zabbix Agent\zabbix_agentd.exe" -c "%PROGRAMFILES%\Zabbix Agent\zabbix_agentd.conf" --stop'>
+            <exit code="1" />
+            <exit code="0" />
+        </downgrade>
+        <downgrade cmd='"%PROGRAMFILES%\Zabbix Agent\zabbix_agentd.exe" -c "%PROGRAMFILES%\Zabbix Agent\zabbix_agentd.conf" --uninstall'>
+            <exit code="1" />
+            <exit code="0" />
         </downgrade>
         <downgrade include="install" />
- 
-        <remove cmd='%COMSPEC% /C sc stop "Zabbix Agent"'>
-            <exit code="any" />
+
+        <remove cmd='"%PROGRAMFILES%\Zabbix Agent\zabbix_agentd.exe" -c "%PROGRAMFILES%\Zabbix Agent\zabbix_agentd.conf" --stop'>
+            <exit code="1" />
+            <exit code="0" />
+        </remove>
+        <remove cmd='"%PROGRAMFILES%\Zabbix Agent\zabbix_agentd.exe" -c "%PROGRAMFILES%\Zabbix Agent\zabbix_agentd.conf" --uninstall'>
+            <exit code="1" />
+            <exit code="0" />
         </remove>
         <remove cmd='%COMSPEC% /C msiexec /qn /norestart /x "%MSI%"' />
         <remove cmd='netsh firewall delete portopening TCP 10050' />