Merge pull request #3926 from input-output-hk/rcd-52-indiscriminate-killing

[RCD-52]  cardano-launcher | win64:  kill self via PID, not process name

Author: deepfire

tools/cardano-sl-tools.cabal

@@ -222,6 +222,8 @@ executable cardano-launcher
                      , yaml
   if !os(windows)
     build-depends:     unix
+  else
+    build-depends:     Win32
   default-language:    Haskell2010
   ghc-options:         -threaded
                        -Wall

tools/src/launcher/Main.hs

@@ -12,6 +12,7 @@
 {-# LANGUAGE RecordWildCards       #-}
 {-# LANGUAGE TemplateHaskell       #-}
 {-# LANGUAGE TypeSynonymInstances  #-}
+{-# OPTIONS_GHC -Wno-type-defaults #-}
 
 import qualified Prelude (show)
 import           Universum
@@ -57,6 +58,8 @@ import           Text.PrettyPrint.ANSI.Leijen (Doc)
 #ifndef mingw32_HOST_OS
 import           System.Posix.Signals (sigKILL, signalProcess)
 import qualified System.Process.Internals as Process
+#else
+import qualified System.Win32.Process as Process
 #endif
 
 -- Modules needed for system'
@@ -586,8 +589,13 @@ writeWindowsUpdaterRunner :: FilePath -> M ()
 writeWindowsUpdaterRunner runnerPath = liftIO $ do
     exePath <- getExecutablePath
     launcherArgs <- getArgs
+#ifdef mingw32_HOST_OS
+    selfPid <- Process.getCurrentProcessId
+#else
+    let selfPid = 0 -- This will never be run on non-Windows
+#endif
     writeFile (toString runnerPath) $ unlines
-        [ "TaskKill /IM cardano-launcher.exe /F"
+        [ "TaskKill /PID "<>show selfPid<>" /F"
         -- Run updater
         , "%*"
         -- Delete updater