From 8573385d4c2405a45ac3904cd9777a366f4124fc Mon Sep 17 00:00:00 2001
From: Zoran Bjelica <100371150+zoran-bjelica@users.noreply.github.com>
Date: Mon, 2 May 2022 11:05:31 +0200
Subject: [PATCH] [MacOS] Add ImageMagick (#5445)

---
 images/macos/software-report/SoftwareReport.Common.psm1   | 5 +++++
 images/macos/software-report/SoftwareReport.Generator.ps1 | 3 ++-
 images/macos/tests/BasicTools.Tests.ps1                   | 6 ++++++
 images/macos/toolsets/toolset-10.15.json                  | 3 ++-
 images/macos/toolsets/toolset-11.json                     | 3 ++-
 images/macos/toolsets/toolset-12.json                     | 3 ++-
 6 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/images/macos/software-report/SoftwareReport.Common.psm1 b/images/macos/software-report/SoftwareReport.Common.psm1
index 69588aa0..6efb0c6c 100644
--- a/images/macos/software-report/SoftwareReport.Common.psm1
+++ b/images/macos/software-report/SoftwareReport.Common.psm1
@@ -547,6 +547,11 @@ function Get-YqVersion {
     return "$yqVersion"
 }
 
+function Get-ImageMagickVersion {
+    $imagemagickVersion = Run-Command "magick --version" | Select-Object -First 1 | Take-Part -Part 1,2
+    return "$imagemagickVersion"
+}
+
 function Build-PackageManagementEnvironmentTable {
     return @(
         @{
diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1
index 857b69a6..d1ac84e6 100644
--- a/images/macos/software-report/SoftwareReport.Generator.ps1
+++ b/images/macos/software-report/SoftwareReport.Generator.ps1
@@ -123,7 +123,8 @@ $utilitiesList = @(
     (Get-GPGVersion),
     (Get-SwitchAudioOsxVersion),
     (Get-SoxVersion),
-    (Get-YqVersion)
+    (Get-YqVersion),
+    (Get-ImageMagickVersion)
 )
 
 if ($os.IsLessThanMonterey) {
diff --git a/images/macos/tests/BasicTools.Tests.ps1 b/images/macos/tests/BasicTools.Tests.ps1
index f40a484b..77788ad7 100644
--- a/images/macos/tests/BasicTools.Tests.ps1
+++ b/images/macos/tests/BasicTools.Tests.ps1
@@ -186,4 +186,10 @@ Describe "yq" {
     It "yq" {
         "yq --version" | Should -ReturnZeroExitCode
     }
+}
+
+Describe "imagemagick" {
+    It "imagemagick" {
+        "magick -version" | Should -ReturnZeroExitCode
+    }
 }
\ No newline at end of file
diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json
index 52950bff..9361449d 100644
--- a/images/macos/toolsets/toolset-10.15.json
+++ b/images/macos/toolsets/toolset-10.15.json
@@ -224,7 +224,8 @@
             "libxext",
             "libxft",
             "tcl-tk",
-            "yq"
+            "yq",
+            "imagemagick"
         ],
         "cask_packages": [
             "julia",
diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json
index 5927c360..9d60f9ed 100644
--- a/images/macos/toolsets/toolset-11.json
+++ b/images/macos/toolsets/toolset-11.json
@@ -213,7 +213,8 @@
             "libxft",
             "tcl-tk",
             "r",
-            "yq"
+            "yq",
+            "imagemagick"
         ],
         "cask_packages": [
             "julia"
diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json
index 5ded7269..ce56009f 100644
--- a/images/macos/toolsets/toolset-12.json
+++ b/images/macos/toolsets/toolset-12.json
@@ -135,7 +135,8 @@
             "libxft",
             "tcl-tk",
             "r",
-            "yq"
+            "yq",
+            "imagemagick"
         ],
         "cask_packages": [
             "julia"