diff --git a/images/linux/scripts/installers/ansible.sh b/images/linux/scripts/installers/ansible.sh index b4a82a703..fcf039308 100644 --- a/images/linux/scripts/installers/ansible.sh +++ b/images/linux/scripts/installers/ansible.sh @@ -8,10 +8,8 @@ source $HELPER_SCRIPTS/document.sh source $HELPER_SCRIPTS/os.sh -imageLabel=$(getOSVersionLabel) - # ppa:ansible/ansible doesn't contain packages for Ubuntu20.04 -if [ $imageLabel != "focal" ]; then +if isUbuntu16 || isUbuntu18 ; then add-apt-repository ppa:ansible/ansible apt-get update fi diff --git a/images/linux/scripts/installers/dotnetcore-sdk.sh b/images/linux/scripts/installers/dotnetcore-sdk.sh index 68f07c4f7..e3762e1c5 100644 --- a/images/linux/scripts/installers/dotnetcore-sdk.sh +++ b/images/linux/scripts/installers/dotnetcore-sdk.sh @@ -8,15 +8,13 @@ source $HELPER_SCRIPTS/apt.sh source $HELPER_SCRIPTS/document.sh source $HELPER_SCRIPTS/os.sh -imageLabel=$(getOSVersionLabel) - # Ubuntu 20 doesn't support EOL versions -if [ $imageLabel != "focal" ]; then - LATEST_DOTNET_PACKAGES=("dotnet-sdk-3.0" "dotnet-sdk-3.1") - release_urls=("https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/2.1/releases.json" "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/2.2/releases.json" "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/3.0/releases.json" "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/3.1/releases.json") -else +if isUbuntu20 ; then LATEST_DOTNET_PACKAGES=("dotnet-sdk-3.1") release_urls=("https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/2.1/releases.json" "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/3.1/releases.json") +else + LATEST_DOTNET_PACKAGES=("dotnet-sdk-3.0" "dotnet-sdk-3.1") + release_urls=("https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/2.1/releases.json" "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/2.2/releases.json" "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/3.0/releases.json" "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/3.1/releases.json") fi mksamples()