Merge branch 'master' into v-andmis/ubuntu/131_remove_duplicate_repos_dotnetcore

This commit is contained in:
Andy Mishechkin
2020-02-26 10:55:34 +04:00
18 changed files with 218 additions and 53 deletions

View File

@@ -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"

View File

@@ -8,14 +8,16 @@
source $HELPER_SCRIPTS/document.sh
LSB_RELEASE=$(lsb_release -rs)
sh -c 'echo "deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-bionic-prod bionic main" > /etc/apt/sources.list.d/dotnetdev.list'
# libicu64, which comes with php-intl module, has powershell breaking issue https://github.com/PowerShell/PowerShell/issues/9746
# Fix - install additional libicu65 where the issue is fixed
echo "install libicu65"
apt get install libicu65
# Install Powershell
apt-get install -y powershell
# Temp fix based on: https://github.com/PowerShell/PowerShell/issues/9746
sudo apt remove libicu64
# Run tests to determine that the software installed as expected
echo "Testing to make sure that script performed as expected, and basic scenarios work"
if ! command -v pwsh; then