diff --git a/images/linux/scripts/installers/1604/basic.sh b/images/linux/scripts/installers/1604/basic.sh index fffeba833..99c80a313 100644 --- a/images/linux/scripts/installers/1604/basic.sh +++ b/images/linux/scripts/installers/1604/basic.sh @@ -31,11 +31,12 @@ apt-fast install -y --no-install-recommends \ sudo \ telnet \ time \ + tzdata \ unzip \ upx \ wget \ zip \ - tzdata + zstd # Electron / VSCode / GitHub Desktop prereqs apt-fast install -y --no-install-recommends \ @@ -86,8 +87,9 @@ DocumentInstalledItemIndent "shellcheck" DocumentInstalledItemIndent "sudo" DocumentInstalledItemIndent "telnet" DocumentInstalledItemIndent "time" +DocumentInstalledItemIndent "tzdata" DocumentInstalledItemIndent "unzip" DocumentInstalledItemIndent "upx" DocumentInstalledItemIndent "wget" DocumentInstalledItemIndent "zip" -DocumentInstalledItemIndent "tzdata" +DocumentInstalledItemIndent "zstd" diff --git a/images/linux/scripts/installers/1804/basic.sh b/images/linux/scripts/installers/1804/basic.sh index 043400f8b..c12c7a819 100644 --- a/images/linux/scripts/installers/1804/basic.sh +++ b/images/linux/scripts/installers/1804/basic.sh @@ -58,6 +58,9 @@ apt-get install -y --no-install-recommends telnet echo "Install time" apt-get install -y --no-install-recommends time +echo "Install tzdata" +apt-get install -y --no-install-recommends tzdata + echo "Install unzip" apt-get install -y --no-install-recommends unzip @@ -70,8 +73,8 @@ apt-get install -y --no-install-recommends wget echo "Install zip" apt-get install -y --no-install-recommends zip -echo "Install tzdata" -apt-get install -y --no-install-recommends tzdata +echo "Install zstd" +apt-get install -y --no-install-recommends zstd echo "Install libxkbfile" apt-get install -y --no-install-recommends libxkbfile-dev @@ -155,8 +158,9 @@ DocumentInstalledItemIndent "shellcheck" DocumentInstalledItemIndent "sudo" DocumentInstalledItemIndent "telnet" DocumentInstalledItemIndent "time" +DocumentInstalledItemIndent "tzdata" DocumentInstalledItemIndent "unzip" DocumentInstalledItemIndent "upx" DocumentInstalledItemIndent "wget" DocumentInstalledItemIndent "zip" -DocumentInstalledItemIndent "tzdata" +DocumentInstalledItemIndent "zstd" diff --git a/images/win/Windows2016-Azure.json b/images/win/Windows2016-Azure.json index 98d96feb9..5cba4e2c5 100644 --- a/images/win/Windows2016-Azure.json +++ b/images/win/Windows2016-Azure.json @@ -502,6 +502,12 @@ "{{ template_dir }}/scripts/Installers/Install-Jq.ps1" ] }, + { + "type": "powershell", + "scripts":[ + "{{ template_dir }}/scripts/Installers/Install-Zstd.ps1" + ] + }, { "type": "powershell", "scripts":[ @@ -763,6 +769,12 @@ "{{ template_dir }}/scripts/Installers/Validate-Jq.ps1" ] }, + { + "type": "powershell", + "scripts":[ + "{{ template_dir }}/scripts/Installers/Validate-Zstd.ps1" + ] + }, { "type": "powershell", "scripts":[ diff --git a/images/win/scripts/Installers/Install-Zstd.ps1 b/images/win/scripts/Installers/Install-Zstd.ps1 new file mode 100644 index 000000000..098334ebe --- /dev/null +++ b/images/win/scripts/Installers/Install-Zstd.ps1 @@ -0,0 +1,6 @@ +################################################################################ +## File: Install-zstd.ps1 +## Desc: Install zstd +################################################################################ + +choco install zstandard -y diff --git a/images/win/scripts/Installers/Validate-Zstd.ps1 b/images/win/scripts/Installers/Validate-Zstd.ps1 new file mode 100644 index 000000000..18f3a3343 --- /dev/null +++ b/images/win/scripts/Installers/Validate-Zstd.ps1 @@ -0,0 +1,24 @@ +################################################################################ +## File: Validate-zstd.ps1 +## Desc: Validate zstd +################################################################################ + +if (Get-Command -Name 'zstd') +{ + Write-Host "zstd on path" +} +else +{ + Write-Host 'zstd is not on path' + exit 1 +} + +# Adding description of the software to Markdown +$SoftwareName = "zstd" +$zstdVersion = $(zstd --version).Split(' ')[6].Split(',')[0] + +$Description = @" +_Version:_ $zstdVersion
+"@ + +Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $Description