diff --git a/images/linux/scripts/installers/azpowershell.sh b/images/linux/scripts/installers/azpowershell.sh index f18492c5e..6c299e32b 100644 --- a/images/linux/scripts/installers/azpowershell.sh +++ b/images/linux/scripts/installers/azpowershell.sh @@ -4,9 +4,6 @@ ## Desc: Installed Azure PowerShell ################################################################################ -# Source the helpers for use with the script -source $HELPER_SCRIPTS/os.sh - # List of versions toolset="$INSTALLER_SCRIPT_FOLDER/toolset.json" versions=$(jq -r '.azureModules[] | select(.name | contains("az")) | .versions[]' $toolset) @@ -18,10 +15,6 @@ pwsh -Command "Update-Module -Name PowerShellGet -Force" # Install Azure CLI (instructions taken from https://docs.microsoft.com/en-us/cli/azure/install-azure-cli) for version in ${versions[@]}; do pwsh -Command "Save-Module -Name Az -LiteralPath /usr/share/az_$version -RequiredVersion $version -Force -Verbose" - if isUbuntu20; then - rm -rf "/usr/share/az_$version/Az.Accounts" - pwsh -Command "Save-Module -Name Az.Accounts -LiteralPath /usr/share/az_$version -RequiredVersion 1.9.5 -Force -Verbose" - fi done # Run tests to determine that the software installed as expected diff --git a/images/linux/scripts/installers/powershellcore.sh b/images/linux/scripts/installers/powershellcore.sh index 0ac52072d..c3a2c53d3 100644 --- a/images/linux/scripts/installers/powershellcore.sh +++ b/images/linux/scripts/installers/powershellcore.sh @@ -4,17 +4,8 @@ ## Desc: Installs powershellcore ################################################################################ -# Source the helpers for use with the script -source $HELPER_SCRIPTS/os.sh - # Install Powershell -if isUbuntu20 ; then - snap install powershell --classic --channel=edge/useedge -fi - -if isUbuntu16 || isUbuntu18 ; then - apt-get install -y powershell -fi +apt-get install -y powershell # Run tests to determine that the software installed as expected echo "Testing to make sure that script performed as expected, and basic scenarios work"