From 258aae1e63434ef428a78deb9a1a6f73ea9c37db Mon Sep 17 00:00:00 2001 From: Rammus Xu Date: Mon, 23 Dec 2019 18:14:55 +0800 Subject: [PATCH 1/3] Add parallel on linux --- images/linux/scripts/installers/1604/basic.sh | 4 +++- images/linux/scripts/installers/1804/basic.sh | 6 +++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/images/linux/scripts/installers/1604/basic.sh b/images/linux/scripts/installers/1604/basic.sh index b939cf581..cce26c99e 100644 --- a/images/linux/scripts/installers/1604/basic.sh +++ b/images/linux/scripts/installers/1604/basic.sh @@ -25,6 +25,7 @@ apt-fast install -y --no-install-recommends \ locales \ netcat \ openssh-client \ + parallel \ rsync \ shellcheck \ sudo \ @@ -54,7 +55,7 @@ apt-fast install -y --no-install-recommends \ # Run tests to determine that the software installed as expected echo "Testing to make sure that script performed as expected, and basic scenarios work" -for cmd in curl file ftp jq netcat ssh rsync shellcheck sudo telnet time unzip wget zip; do +for cmd in curl file ftp jq netcat ssh parallel rsync shellcheck sudo telnet time unzip wget zip; do if ! command -v $cmd; then echo "$cmd was not installed" exit 1 @@ -77,6 +78,7 @@ DocumentInstalledItemIndent "libunwind8" DocumentInstalledItemIndent "locales" DocumentInstalledItemIndent "netcat" DocumentInstalledItemIndent "openssh-client" +DocumentInstalledItemIndent "parallel" DocumentInstalledItemIndent "rsync" DocumentInstalledItemIndent "shellcheck" DocumentInstalledItemIndent "sudo" diff --git a/images/linux/scripts/installers/1804/basic.sh b/images/linux/scripts/installers/1804/basic.sh index fdb2ec572..5516cdea3 100644 --- a/images/linux/scripts/installers/1804/basic.sh +++ b/images/linux/scripts/installers/1804/basic.sh @@ -118,9 +118,12 @@ apt-get install -y --no-install-recommends zsync echo "Install curl" apt-get install -y --no-install-recommends curl +echo "Install parallel" +apt-get install -y --no-install-recommends parallel + # Run tests to determine that the software installed as expected echo "Testing to make sure that script performed as expected, and basic scenarios work" -for cmd in curl file ftp jq netcat ssh rsync shellcheck sudo telnet time unzip wget zip; do +for cmd in curl file ftp jq netcat ssh parallel rsync shellcheck sudo telnet time unzip wget zip; do if ! command -v $cmd; then echo "$cmd was not installed" exit 1 @@ -143,6 +146,7 @@ DocumentInstalledItemIndent "libunwind8" DocumentInstalledItemIndent "locales" DocumentInstalledItemIndent "netcat" DocumentInstalledItemIndent "openssh-client" +DocumentInstalledItemIndent "parallel" DocumentInstalledItemIndent "rsync" DocumentInstalledItemIndent "shellcheck" DocumentInstalledItemIndent "sudo" From 921cc9076705ceced8542a7e8ea9c1f2dcf2bc6a Mon Sep 17 00:00:00 2001 From: Timothy Clem Date: Tue, 21 Jan 2020 14:25:51 -0800 Subject: [PATCH 2/3] Include ghc version 8.8.2 --- images/linux/scripts/installers/haskell.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/images/linux/scripts/installers/haskell.sh b/images/linux/scripts/installers/haskell.sh index 3d47ad2f2..14429e92d 100644 --- a/images/linux/scripts/installers/haskell.sh +++ b/images/linux/scripts/installers/haskell.sh @@ -24,6 +24,7 @@ apt-get install -y \ ghc-8.6.4 \ ghc-8.6.5 \ ghc-8.8.1 \ + ghc-8.8.2 \ cabal-install-2.0 \ cabal-install-2.2 \ cabal-install-2.4 \ @@ -35,7 +36,7 @@ curl -sSL https://raw.githubusercontent.com/commercialhaskell/stack/v2.1.3/etc/s # Run tests to determine that the software installed as expected echo "Testing to make sure that script performed as expected, and basic scenarios work" # Check all ghc versions -for version in 8.0.2 8.2.2 8.4.4 8.6.2 8.6.3 8.6.4 8.6.5 8.8.1; do +for version in 8.0.2 8.2.2 8.4.4 8.6.2 8.6.3 8.6.4 8.6.5 8.8.1 8.8.2; do if ! command -v /opt/ghc/$version/bin/ghc; then echo "ghc $version was not installed" exit 1 @@ -58,7 +59,7 @@ echo "Lastly, documenting what we added to the metadata file" for version in 2.0 2.2 2.4 3.0; do DocumentInstalledItem "Haskell Cabal ($(/opt/cabal/$version/bin/cabal --version))" done -for version in 8.0.2 8.2.2 8.4.4 8.6.2 8.6.3 8.6.4 8.6.5 8.8.1; do +for version in 8.0.2 8.2.2 8.4.4 8.6.2 8.6.3 8.6.4 8.6.5 8.8.1 8.8.2; do DocumentInstalledItem "GHC ($(/opt/ghc/$version/bin/ghc --version))" done DocumentInstalledItem "Haskell Stack ($(stack --version))" From f299a5d6810743714f92dd3fcbc710c572ee25bf Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov Date: Mon, 3 Feb 2020 19:56:22 +0300 Subject: [PATCH 3/3] fix choco installation --- images/win/scripts/Installers/Windows2016/Initialize-VM.ps1 | 1 + images/win/scripts/Installers/Windows2019/Initialize-VM.ps1 | 1 + 2 files changed, 2 insertions(+) diff --git a/images/win/scripts/Installers/Windows2016/Initialize-VM.ps1 b/images/win/scripts/Installers/Windows2016/Initialize-VM.ps1 index e22d9da8d..7998f1cb7 100644 --- a/images/win/scripts/Installers/Windows2016/Initialize-VM.ps1 +++ b/images/win/scripts/Installers/Windows2016/Initialize-VM.ps1 @@ -92,6 +92,7 @@ else { } # Run the installer +[Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor "Tls12" Invoke-Expression ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1')) # Turn off confirmation diff --git a/images/win/scripts/Installers/Windows2019/Initialize-VM.ps1 b/images/win/scripts/Installers/Windows2019/Initialize-VM.ps1 index 09567e71a..9930e6a6d 100644 --- a/images/win/scripts/Installers/Windows2019/Initialize-VM.ps1 +++ b/images/win/scripts/Installers/Windows2019/Initialize-VM.ps1 @@ -92,6 +92,7 @@ else { } # Run the installer +[Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor "Tls12" Invoke-Expression ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1')) # Turn off confirmation