From a54701e01b6b36e345042ccf373b946b2b457dcb Mon Sep 17 00:00:00 2001
From: Yuriy <yuriy.gettya@elastic.co>
Date: Sat, 26 Oct 2019 23:16:43 -0500
Subject: [PATCH] Distinguish between name of Windows Service and sub-product
 in path

---
 src/installer/BeatPackageCompiler/BeatPackageCompiler.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/installer/BeatPackageCompiler/BeatPackageCompiler.cs b/src/installer/BeatPackageCompiler/BeatPackageCompiler.cs
index 9d8f5eab..8a3a8a38 100644
--- a/src/installer/BeatPackageCompiler/BeatPackageCompiler.cs
+++ b/src/installer/BeatPackageCompiler/BeatPackageCompiler.cs
@@ -24,6 +24,7 @@ static void Main(string[] args)
 
             var companyName = MagicStrings.Elastic;
             var productSetName = MagicStrings.Beats.Name;
+            var subProductName = ap.TargetName;
             var displayName = MagicStrings.Beats.Name + " " + ap.TargetName;
             var serviceName = ap.TargetName;
             var exeName = ap.TargetName + MagicStrings.Ext.DotExe;
@@ -91,7 +92,7 @@ static void Main(string[] args)
                     .Replace("\n\n", @"\par" + "\r\n") +
                 @"\par}");
 
-            var installSubPath = $@"{companyName}\{productSetName}\{ap.Version}\{serviceName}";
+            var installSubPath = $@"{companyName}\{productSetName}\{ap.Version}\{subProductName}";
 
             WixSharp.File service = null;
             if (pi.IsWindowsService)