From 3500bbdf3e471b887d4e4b99aecefd79d9d61d80 Mon Sep 17 00:00:00 2001
From: Dibir Magomedsaygitov <dibir-magomedsaygitov@github.com>
Date: Thu, 24 Sep 2020 16:50:28 +0300
Subject: [PATCH] add sphinx version and remove pollinate

---
 .../scripts/SoftwareReport/SoftwareReport.Generator.ps1      | 3 +--
 .../linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1   | 5 +++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1
index 5c93cdd5b..f4dce82c7 100644
--- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1
+++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1
@@ -101,11 +101,10 @@ $toolsList = @(
     (Get-NewmanVersion),
     (Get-NvmVersion),
     (Get-PackerVersion),
-    ("Pollinate"),
     (Get-PhantomJSVersion),
     (Get-PulumiVersion),
     (Get-RVersion),
-    ("Sphinx Open Source Search Server"),
+    (Get-SphinxVersion),
     (Get-SwigVersion),
     (Get-TerraformVersion),
     (Get-UnZipVersion),
diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1
index 43828d48a..35b5ec4de 100644
--- a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1
+++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1
@@ -257,3 +257,8 @@ function Get-RVersion {
     $rVersion = R --version | Select-String "R version" | Take-OutputPart -Part -2
     return "R $rVersion"
 }
+
+function Get-SphinxVersion {
+    $sphinxVersion = searchd | Take-OutputPart -Part 1 | Take-OutputPart -Part 0 -Delimiter "-"
+    return "Sphinx Open Source Search Server $rVersion"
+}
\ No newline at end of file