From cb18129a4f31957af79b4d3e592cbfdc0e96e6c2 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev Date: Thu, 20 Feb 2020 13:46:38 +0300 Subject: [PATCH 1/4] remove pwsh fix --- images/linux/scripts/installers/1804/powershellcore.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/images/linux/scripts/installers/1804/powershellcore.sh b/images/linux/scripts/installers/1804/powershellcore.sh index 0a5f21081..8ace4742c 100644 --- a/images/linux/scripts/installers/1804/powershellcore.sh +++ b/images/linux/scripts/installers/1804/powershellcore.sh @@ -12,9 +12,6 @@ LSB_RELEASE=$(lsb_release -rs) # 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 From 270945d64bde5a1777562adf8846c29d8bc11f0e Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev Date: Fri, 21 Feb 2020 13:40:21 +0300 Subject: [PATCH 2/4] add libicu65 installation --- images/linux/scripts/installers/1804/powershellcore.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/images/linux/scripts/installers/1804/powershellcore.sh b/images/linux/scripts/installers/1804/powershellcore.sh index 8ace4742c..accd923b6 100644 --- a/images/linux/scripts/installers/1804/powershellcore.sh +++ b/images/linux/scripts/installers/1804/powershellcore.sh @@ -8,6 +8,9 @@ source $HELPER_SCRIPTS/document.sh LSB_RELEASE=$(lsb_release -rs) +# 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 +sudo apt get install libicu65 # Install Powershell apt-get install -y powershell From 15568d893acceec1b361be4dc1fd0fd6abb998fe Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev Date: Sat, 22 Feb 2020 14:55:33 +0300 Subject: [PATCH 3/4] add echo --- images/linux/scripts/installers/1804/powershellcore.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/images/linux/scripts/installers/1804/powershellcore.sh b/images/linux/scripts/installers/1804/powershellcore.sh index accd923b6..61bbb18d0 100644 --- a/images/linux/scripts/installers/1804/powershellcore.sh +++ b/images/linux/scripts/installers/1804/powershellcore.sh @@ -10,6 +10,7 @@ source $HELPER_SCRIPTS/document.sh LSB_RELEASE=$(lsb_release -rs) # 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" sudo apt get install libicu65 # Install Powershell From 72040db7ae68f3a5814be60e708a57246e1b22d7 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev Date: Sat, 22 Feb 2020 14:57:14 +0300 Subject: [PATCH 4/4] remove sudo --- images/linux/scripts/installers/1804/powershellcore.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/scripts/installers/1804/powershellcore.sh b/images/linux/scripts/installers/1804/powershellcore.sh index 61bbb18d0..72ccdfa90 100644 --- a/images/linux/scripts/installers/1804/powershellcore.sh +++ b/images/linux/scripts/installers/1804/powershellcore.sh @@ -11,7 +11,7 @@ LSB_RELEASE=$(lsb_release -rs) # 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" -sudo apt get install libicu65 +apt get install libicu65 # Install Powershell apt-get install -y powershell