From 95cd934020f611ccc394dc385c5bdc0d0d654d98 Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Fri, 31 Jan 2020 12:21:33 +0300 Subject: [PATCH 1/3] add libpq-dev --- images/linux/scripts/installers/postgresql.sh | 16 ++++++++++++++++ images/linux/ubuntu1604.json | 1 + images/linux/ubuntu1804.json | 1 + 3 files changed, 18 insertions(+) create mode 100644 images/linux/scripts/installers/postgresql.sh diff --git a/images/linux/scripts/installers/postgresql.sh b/images/linux/scripts/installers/postgresql.sh new file mode 100644 index 00000000..b3150671 --- /dev/null +++ b/images/linux/scripts/installers/postgresql.sh @@ -0,0 +1,16 @@ +#!/bin/bash +################################################################################ +## File: postgresql.sh +## Desc: Installs Postgresql +################################################################################ + +# Source the helpers for use with the script +source $HELPER_SCRIPTS/document.sh + +echo "Install libpq-dev" +apt-get install libpq-dev + +echo "Install Postgresql Client" +apt-get install postgresql-client + +DocumentInstalledItem "($(psql -V 2>&1 | cut -d ' ' -f 1,2,3))" \ No newline at end of file diff --git a/images/linux/ubuntu1604.json b/images/linux/ubuntu1604.json index bca6a3ed..b8a25a87 100644 --- a/images/linux/ubuntu1604.json +++ b/images/linux/ubuntu1604.json @@ -152,6 +152,7 @@ "{{template_dir}}/scripts/installers/phantomjs.sh", "{{template_dir}}/scripts/installers/1604/php.sh", "{{template_dir}}/scripts/installers/pollinate.sh", + "{{template_dir}}/scripts/installers/postgresql.sh", "{{template_dir}}/scripts/installers/1604/powershellcore.sh", "{{template_dir}}/scripts/installers/ruby.sh", "{{template_dir}}/scripts/installers/rust.sh", diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json index 5c57731d..f141db02 100644 --- a/images/linux/ubuntu1804.json +++ b/images/linux/ubuntu1804.json @@ -155,6 +155,7 @@ "{{template_dir}}/scripts/installers/phantomjs.sh", "{{template_dir}}/scripts/installers/1804/php.sh", "{{template_dir}}/scripts/installers/pollinate.sh", + "{{template_dir}}/scripts/installers/postgresql.sh", "{{template_dir}}/scripts/installers/1804/powershellcore.sh", "{{template_dir}}/scripts/installers/ruby.sh", "{{template_dir}}/scripts/installers/rust.sh", From 2515037b79a3b890deafc99110beb7cf4986e2e4 Mon Sep 17 00:00:00 2001 From: Tim Heuer Date: Sat, 1 Feb 2020 11:18:06 -0800 Subject: [PATCH 2/3] Adding vswhere to tool install --- images/win/Windows2019-Azure.json | 12 +++++++++ .../scripts/Installers/Install-VSWhere.ps1 | 6 +++++ .../scripts/Installers/Validate-VSWhere.ps1 | 25 +++++++++++++++++++ 3 files changed, 43 insertions(+) create mode 100644 images/win/scripts/Installers/Install-VSWhere.ps1 create mode 100644 images/win/scripts/Installers/Validate-VSWhere.ps1 diff --git a/images/win/Windows2019-Azure.json b/images/win/Windows2019-Azure.json index 1b411672..46792679 100644 --- a/images/win/Windows2019-Azure.json +++ b/images/win/Windows2019-Azure.json @@ -355,6 +355,12 @@ "elevated_user": "{{user `install_user`}}", "elevated_password": "{{user `install_password`}}" }, + { + "type": "powershell", + "scripts":[ + "{{ template_dir }}/scripts/Installers/Install-VSWhere.ps1" + ] + }, { "type": "powershell", "scripts":[ @@ -774,6 +780,12 @@ "{{ template_dir }}/scripts/Installers/Validate-Vcpkg.ps1" ] }, + { + "type": "powershell", + "scripts":[ + "{{ template_dir }}/scripts/Installers/Validate-VSWhere.ps1" + ] + }, { "type": "powershell", "scripts":[ diff --git a/images/win/scripts/Installers/Install-VSWhere.ps1 b/images/win/scripts/Installers/Install-VSWhere.ps1 new file mode 100644 index 00000000..d6098654 --- /dev/null +++ b/images/win/scripts/Installers/Install-VSWhere.ps1 @@ -0,0 +1,6 @@ +################################################################################ +## File: Install-VSWhere.ps1 +## Desc: Install latest stable version of VSWhere +################################################################################ + +choco install vswhere -y diff --git a/images/win/scripts/Installers/Validate-VSWhere.ps1 b/images/win/scripts/Installers/Validate-VSWhere.ps1 new file mode 100644 index 00000000..7b41519c --- /dev/null +++ b/images/win/scripts/Installers/Validate-VSWhere.ps1 @@ -0,0 +1,25 @@ +################################################################################ +## File: Validate-VSWhere.ps1 +## Desc: Validate vswhere +################################################################################ + +if(Get-Command -Name 'vswhere') +{ + Write-Host "vswhere $(vswhere) on path" +} +else +{ + Write-Host "vswhere is not on path" + exit 1 +} + +# Adding description of the software to Markdown +$SoftwareName = "VSWhere" +$VswhereVersion = $(vswhere) + +$Description = @" +_Version_: $VswhereVersion
+* PATH: contains location of vswhere.exe +"@ + +Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $Description \ No newline at end of file From 66eb6d187850167ed6868d720f4deef62b1889ae Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Mon, 3 Feb 2020 09:37:47 +0300 Subject: [PATCH 3/3] remove extra () --- images/linux/scripts/installers/postgresql.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/scripts/installers/postgresql.sh b/images/linux/scripts/installers/postgresql.sh index b3150671..9f2988a8 100644 --- a/images/linux/scripts/installers/postgresql.sh +++ b/images/linux/scripts/installers/postgresql.sh @@ -13,4 +13,4 @@ apt-get install libpq-dev echo "Install Postgresql Client" apt-get install postgresql-client -DocumentInstalledItem "($(psql -V 2>&1 | cut -d ' ' -f 1,2,3))" \ No newline at end of file +DocumentInstalledItem "$(psql -V 2>&1 | cut -d ' ' -f 1,2,3)" \ No newline at end of file