Merge branch 'master' of github.com:dmitry-shibanov/virtual-environments into v-dmshib/add-netcore-path-docs

This commit is contained in:
Dmitry Shibanov
2020-02-04 09:48:21 +03:00
5 changed files with 13 additions and 4 deletions

View File

@@ -25,6 +25,7 @@ apt-fast install -y --no-install-recommends \
locales \ locales \
netcat \ netcat \
openssh-client \ openssh-client \
parallel \
rsync \ rsync \
shellcheck \ shellcheck \
sudo \ sudo \
@@ -55,7 +56,7 @@ apt-fast install -y --no-install-recommends \
# Run tests to determine that the software installed as expected # Run tests to determine that the software installed as expected
echo "Testing to make sure that script performed as expected, and basic scenarios work" 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 upx wget zip; do for cmd in curl file ftp jq netcat ssh parallel rsync shellcheck sudo telnet time unzip upx wget zip; do
if ! command -v $cmd; then if ! command -v $cmd; then
echo "$cmd was not installed" echo "$cmd was not installed"
exit 1 exit 1
@@ -78,6 +79,7 @@ DocumentInstalledItemIndent "libunwind8"
DocumentInstalledItemIndent "locales" DocumentInstalledItemIndent "locales"
DocumentInstalledItemIndent "netcat" DocumentInstalledItemIndent "netcat"
DocumentInstalledItemIndent "openssh-client" DocumentInstalledItemIndent "openssh-client"
DocumentInstalledItemIndent "parallel"
DocumentInstalledItemIndent "rsync" DocumentInstalledItemIndent "rsync"
DocumentInstalledItemIndent "shellcheck" DocumentInstalledItemIndent "shellcheck"
DocumentInstalledItemIndent "sudo" DocumentInstalledItemIndent "sudo"

View File

@@ -118,9 +118,12 @@ apt-get install -y --no-install-recommends zsync
echo "Install curl" echo "Install curl"
apt-get install -y --no-install-recommends 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 # Run tests to determine that the software installed as expected
echo "Testing to make sure that script performed as expected, and basic scenarios work" 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 if ! command -v $cmd; then
echo "$cmd was not installed" echo "$cmd was not installed"
exit 1 exit 1
@@ -143,6 +146,7 @@ DocumentInstalledItemIndent "libunwind8"
DocumentInstalledItemIndent "locales" DocumentInstalledItemIndent "locales"
DocumentInstalledItemIndent "netcat" DocumentInstalledItemIndent "netcat"
DocumentInstalledItemIndent "openssh-client" DocumentInstalledItemIndent "openssh-client"
DocumentInstalledItemIndent "parallel"
DocumentInstalledItemIndent "rsync" DocumentInstalledItemIndent "rsync"
DocumentInstalledItemIndent "shellcheck" DocumentInstalledItemIndent "shellcheck"
DocumentInstalledItemIndent "sudo" DocumentInstalledItemIndent "sudo"

View File

@@ -24,6 +24,7 @@ apt-get install -y \
ghc-8.6.4 \ ghc-8.6.4 \
ghc-8.6.5 \ ghc-8.6.5 \
ghc-8.8.1 \ ghc-8.8.1 \
ghc-8.8.2 \
cabal-install-2.0 \ cabal-install-2.0 \
cabal-install-2.2 \ cabal-install-2.2 \
cabal-install-2.4 \ 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 # Run tests to determine that the software installed as expected
echo "Testing to make sure that script performed as expected, and basic scenarios work" echo "Testing to make sure that script performed as expected, and basic scenarios work"
# Check all ghc versions # 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 if ! command -v /opt/ghc/$version/bin/ghc; then
echo "ghc $version was not installed" echo "ghc $version was not installed"
exit 1 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 for version in 2.0 2.2 2.4 3.0; do
DocumentInstalledItem "Haskell Cabal ($(/opt/cabal/$version/bin/cabal --version))" DocumentInstalledItem "Haskell Cabal ($(/opt/cabal/$version/bin/cabal --version))"
done 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))" DocumentInstalledItem "GHC ($(/opt/ghc/$version/bin/ghc --version))"
done done
DocumentInstalledItem "Haskell Stack ($(stack --version))" DocumentInstalledItem "Haskell Stack ($(stack --version))"

View File

@@ -92,6 +92,7 @@ else {
} }
# Run the installer # Run the installer
[Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor "Tls12"
Invoke-Expression ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1')) Invoke-Expression ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1'))
# Turn off confirmation # Turn off confirmation

View File

@@ -92,6 +92,7 @@ else {
} }
# Run the installer # Run the installer
[Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor "Tls12"
Invoke-Expression ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1')) Invoke-Expression ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1'))
# Turn off confirmation # Turn off confirmation