From d4ff5d74308d7ccefa934f8394cc8f48f67bef44 Mon Sep 17 00:00:00 2001
From: Adam Thorn <alt36@cam.ac.uk>
Date: Fri, 5 Apr 2019 10:13:16 +0100
Subject: [PATCH] Notepad++ -> v7.6.6

---
 notepad++.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/notepad++.xml b/notepad++.xml
index 89bf52e2..b1c140de 100755
--- a/notepad++.xml
+++ b/notepad++.xml
@@ -2,7 +2,7 @@
 <packages>
 <package id="notepad++" name="Notepad++" revision="%version%.1" reboot="false">
  
-  <variable name="version" value="7.6.5" />
+  <variable name="version" value="7.6.6" />
 
   <!-- 64bit version exists as of 7.1, but most of the plugins aren't available. So stick with 32bit until they sort that -->
    <check type="uninstall" condition="versiongreaterorequal" path="Notepad++ (32-bit x86)" value="%version%" />
@@ -15,6 +15,9 @@
  
   <!-- remove plug-ins to prevent installer hanging -->
   <upgrade cmd='cmd /c del /f /q "%ProgramFileswpkg%\Notepad++\plugins\*.dll"' ><exit code="1"/></upgrade>
+  <!-- kill any running notepad++.exe: otherwise, the upgrade appears to succeed but
+       we're actually left with the old binary -->
+  <upgrade cmd='taskkill /F /IM notepad++.exe /FI "STATUS eq RUNNING"' />
   <upgrade cmd="%SOFTWARE%\Notepad++\npp.%version%.Installer.exe /S" />
  
   <remove cmd='cmd /c del /f /q "%ProgramFileswpkg%\Notepad++\plugins\*.dll"' ><exit code="any"/></remove> 
-- 
GitLab