From e621b601101a7df329a43b2f6395ea9bb369557c Mon Sep 17 00:00:00 2001
From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com>
Date: Fri, 15 Jul 2022 08:04:15 +0200
Subject: [PATCH] Revert "[Ubuntu] Apply esl-erlang workaround for 20.04
 (#5867)" (#5909)

This reverts commit 8bef3e36510e61ac89cb853e426036489513ecb7.
---
 images/linux/scripts/installers/erlang.sh | 23 +----------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

diff --git a/images/linux/scripts/installers/erlang.sh b/images/linux/scripts/installers/erlang.sh
index 00005f6f9..6aaa4a86b 100644
--- a/images/linux/scripts/installers/erlang.sh
+++ b/images/linux/scripts/installers/erlang.sh
@@ -6,7 +6,6 @@
 
 # Source the helpers for use with the script
 source $HELPER_SCRIPTS/install.sh
-source $HELPER_SCRIPTS/os.sh
 
 source_list=/etc/apt/sources.list.d/eslerlang.list
 source_key=/usr/share/keyrings/eslerlang.gpg
@@ -14,28 +13,8 @@ source_key=/usr/share/keyrings/eslerlang.gpg
 # Install Erlang
 wget -q -O - https://packages.erlang-solutions.com/ubuntu/erlang_solutions.asc | gpg --dearmor > $source_key
 echo "deb [signed-by=$source_key]  https://packages.erlang-solutions.com/ubuntu $(lsb_release -cs) contrib" > $source_list
-
 apt-get update
-
-if isUbuntu20; then
-    # https://github.com/actions/virtual-environments/issues/5859
-    # hashes mismatch is going to happen due to not updated release file
-    # on the server side,
-    # pulling all the dependencies first without apt-cache parsing
-    # but ignore the error
-    apt-get install --no-install-recommends esl-erlang || true
-
-    # Downoloading and installing a deb file manually, ignore deptree errors
-    esl_url="https://packages.erlang-solutions.com/ubuntu/pool/esl-erlang_25.0.2-1~ubuntu~focal_amd64.deb"
-    download_with_retries $esl_url  "/tmp"
-    dpkg -i /tmp/esl-erlang_25.0.2-1~ubuntu~focal_amd64.deb || true
-
-    # Restore a proper deptree which brings esl-erlang back in the loop
-    # but eleminate unwanted X.org dependencies
-    apt --no-install-recommends --fix-broken install
-else
-   apt-get install --no-install-recommends esl-erlang
-fi
+apt-get install -y --no-install-recommends esl-erlang
 
 # Install rebar3
 rebar3_url="https://github.com/erlang/rebar3/releases/latest/download/rebar3"