From 536cfa24b0714ec26c8b46129913efa22562fd8e Mon Sep 17 00:00:00 2001
From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com>
Date: Wed, 18 May 2022 14:39:37 +0200
Subject: [PATCH] [Ubuntu] Revert powershell fix for Ubuntu 22.04 (#5567)

* Revert powershell fix for Ubuntu 22.04

* Move libssl1.1 dependency

* fix typo

* remove comment
---
 .../linux/scripts/installers/powershellcore.sh | 18 ++----------------
 images/linux/scripts/installers/sqlpackage.sh  |  7 +++++++
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/images/linux/scripts/installers/powershellcore.sh b/images/linux/scripts/installers/powershellcore.sh
index 09129f7e5..e228d9121 100644
--- a/images/linux/scripts/installers/powershellcore.sh
+++ b/images/linux/scripts/installers/powershellcore.sh
@@ -4,19 +4,5 @@
 ##  Desc:  Installs powershellcore
 ################################################################################
 
-# Source the helpers for use with the script
-source $HELPER_SCRIPTS/os.sh
-source $HELPER_SCRIPTS/install.sh
-
-if isUbuntu22; then
-    # Install libssl1.1
-    download_with_retries "http://security.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1l-1ubuntu1.3_amd64.deb" "/tmp"
-    dpkg -i /tmp/libssl1.1_1.1.1l-1ubuntu1.3_amd64.deb
-
-    # Install Powershell
-    download_with_retries "https://github.com/PowerShell/PowerShell/releases/download/v7.2.3/powershell-lts_7.2.3-1.deb_amd64.deb" "/tmp"
-    dpkg -i /tmp/powershell-lts_7.2.3-1.deb_amd64.deb
-else
-    # Install Powershell
-    apt-get install -y powershell
-fi
+# Install Powershell
+apt-get install -y powershell
diff --git a/images/linux/scripts/installers/sqlpackage.sh b/images/linux/scripts/installers/sqlpackage.sh
index 86a1a4995..9e5cc9f0a 100644
--- a/images/linux/scripts/installers/sqlpackage.sh
+++ b/images/linux/scripts/installers/sqlpackage.sh
@@ -6,6 +6,13 @@
 
 # Source the helpers for use with the script
 source $HELPER_SCRIPTS/install.sh
+source $HELPER_SCRIPTS/os.sh
+
+# Install libssl1.1 dependency 
+if isUbuntu22; then
+    download_with_retries "http://security.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1l-1ubuntu1.3_amd64.deb" "/tmp"
+    dpkg -i /tmp/libssl1.1_1.1.1l-1ubuntu1.3_amd64.deb
+fi
 
 # Install SqlPackage
 download_with_retries "https://aka.ms/sqlpackage-linux" "." "sqlpackage.zip"