install powershell modules

images/linux/scripts/SoftwareReport/SoftwareReport.Databases.psm1

@@ -14,8 +14,8 @@ function Get-SqliteVersion {
 }
 
 function Get-MySQLVersion {
-    $mySqlVersion = (mysql --version).Split("/usr/bin/")[1]
+    $mySQLVersion = mysqld --version | Take-OutputPart -Part 2 | Take-OutputPart -Part 0 -Delimiter "-"
-    return "MySQL ($mySqlVersion)"
+    return "MySQL ($mySQLVersion)"
 }
 
 function Build-MySQLSection {

images/linux/scripts/installers/Install-PowerShellModules.ps1

@@ -0,0 +1,31 @@
+$ErrorActionPreference = "Stop"
+
+function Get-ToolsetContent
+{
+    $toolset = Join-Path $env:INSTALLER_SCRIPT_FOLDER "toolset.json"
+    Get-Content $toolset -Raw | ConvertFrom-Json
+}
+
+# Specifies the installation policy
+Set-PSRepository -InstallationPolicy Trusted -Name PSGallery
+
+# Install PowerShell modules
+$modules = (Get-ToolsetContent).powershellModules
+
+foreach($module in $modules)
+{
+    $moduleName = $module.name
+    Write-Host "Installing ${moduleName} module"
+
+    if ($module.versions)
+    {
+        foreach ($version in $module.versions)
+        {
+            Write-Host " - $version"
+            Install-Module -Name $moduleName -RequiredVersion $version -Scope AllUsers -SkipPublisherCheck -Force
+        }
+        continue
+    }
+
+    Install-Module -Name $moduleName -Scope AllUsers -SkipPublisherCheck -Force
+}

images/linux/toolsets/toolset-1604.json

@@ -91,6 +91,10 @@
             "platform-tools"
         ]
     },
+    "powershellModules": [
+        {"name": "MarkdownPS"},
+        {"name": "Pester"}
+    ],
     "azureModules": [
         {
             "name": "az",

images/linux/toolsets/toolset-1804.json

@@ -87,6 +87,10 @@
             "platform-tools"
         ]
     },
+    "powershellModules": [
+        {"name": "MarkdownPS"},
+        {"name": "Pester"}
+    ],
     "azureModules": [
         {
             "name": "az",

images/linux/toolsets/toolset-2004.json

@@ -68,6 +68,10 @@
             "platform-tools"
         ]
     },
+    "powershellModules": [
+        {"name": "MarkdownPS"},
+        {"name": "Pester"}
+    ],
     "apt": {
         "common_packages": [
             "dbus",

images/linux/ubuntu1604.json

@@ -292,10 +292,20 @@
             ],
             "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'"
         },
+        {
+            "type": "shell",
+            "scripts":[
+                "{{template_dir}}/scripts/installers/Install-PowerShellModules.ps1"
+            ],
+            "environment_vars": [
+                "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}"
+            ],
+            "execute_command": "sudo sh -c '{{ .Vars }} pwsh -f {{ .Path }}'"
+        },
         {
             "type": "shell",
             "inline": [
-                "sudo pwsh -File {{user `image_folder`}}/SoftwareReport/SoftwareReport.Generator.ps1 -OutputDirectory {{user `image_folder`}}"
+                "pwsh -File {{user `image_folder`}}/SoftwareReport/SoftwareReport.Generator.ps1 -OutputDirectory {{user `image_folder`}}"
             ],
             "environment_vars":[
                 "IMAGE_VERSION={{user `image_version`}}",

images/linux/ubuntu1804.json

@@ -296,10 +296,20 @@
             ],
             "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'"
         },
+        {
+            "type": "shell",
+            "scripts":[
+                "{{template_dir}}/scripts/installers/Install-PowerShellModules.ps1"
+            ],
+            "environment_vars": [
+                "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}"
+            ],
+            "execute_command": "sudo sh -c '{{ .Vars }} pwsh -f {{ .Path }}'"
+        },
         {
             "type": "shell",
             "inline": [
-                "sudo pwsh -File {{user `image_folder`}}/SoftwareReport/SoftwareReport.Generator.ps1 -OutputDirectory {{user `image_folder`}}"
+                "pwsh -File {{user `image_folder`}}/SoftwareReport/SoftwareReport.Generator.ps1 -OutputDirectory {{user `image_folder`}}"
             ],
             "environment_vars":[
                 "IMAGE_VERSION={{user `image_version`}}",

images/linux/ubuntu2004.json

@@ -298,10 +298,20 @@
             ],
             "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'"
         },
+        {
+            "type": "shell",
+            "scripts":[
+                "{{template_dir}}/scripts/installers/Install-PowerShellModules.ps1"
+            ],
+            "environment_vars": [
+                "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}"
+            ],
+            "execute_command": "sudo sh -c '{{ .Vars }} pwsh -f {{ .Path }}'"
+        },
         {
             "type": "shell",
             "inline": [
-                "sudo pwsh -File {{user `image_folder`}}/SoftwareReport/SoftwareReport.Generator.ps1 -OutputDirectory {{user `image_folder`}}"
+                "pwsh -File {{user `image_folder`}}/SoftwareReport/SoftwareReport.Generator.ps1 -OutputDirectory {{user `image_folder`}}"
             ],
             "environment_vars":[
                 "IMAGE_VERSION={{user `image_version`}}",