From 0d058c4e2cf47d49178bb9048d56f14e1eae7953 Mon Sep 17 00:00:00 2001
From: Shady Ibraheem <shadyysf@github.com>
Date: Wed, 18 Dec 2019 17:50:38 -0500
Subject: [PATCH] Revert "Merge pull request #143 from Lutando/master"

This reverts commit 10ab94b44253a8c2e70a9585a9a18574bb3bca9e, reversing
changes made to 108efe9e90790659222f10bd83043589f7b2ffb1.
---
 images/linux/scripts/installers/1604/azpowershell.sh | 9 +--------
 images/linux/scripts/installers/1804/azpowershell.sh | 7 -------
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/images/linux/scripts/installers/1604/azpowershell.sh b/images/linux/scripts/installers/1604/azpowershell.sh
index c8211f68d..1886e8de7 100644
--- a/images/linux/scripts/installers/1604/azpowershell.sh
+++ b/images/linux/scripts/installers/1604/azpowershell.sh
@@ -12,7 +12,6 @@ sudo pwsh -Command 'Save-Module -Name Az -LiteralPath /usr/share/az_1.0.0 -Requi
 sudo pwsh -Command 'Save-Module -Name Az -LiteralPath /usr/share/az_1.6.0 -RequiredVersion 1.6.0 -Force'
 sudo pwsh -Command 'Save-Module -Name Az -LiteralPath /usr/share/az_2.3.2 -RequiredVersion 2.3.2 -Force'
 sudo pwsh -Command 'Save-Module -Name Az -LiteralPath /usr/share/az_2.6.0 -RequiredVersion 2.6.0 -Force'
-sudo pwsh -Command 'Save-Module -Name Az -LiteralPath /usr/share/az_2.8.0 -RequiredVersion 2.8.0 -Force'
 
 # Run tests to determine that the software installed as expected
 echo "Testing to make sure that script performed as expected, and basic scenarios work"
@@ -35,11 +34,6 @@ if ! pwsh -Command '$actualPSModulePath = $env:PSModulePath ; $env:PSModulePath
     if (!(get-module -listavailable -name Az.accounts)) {
         Write-Host "Az Module was not installed"; $env:PSModulePath = $actualPSModulePath; exit 1
     }
-    $env:PSModulePath = $actualPSModulePath
-    $actualPSModulePath = $env:PSModulePath ; $env:PSModulePath = "/usr/share/az_2.8.0:" + $env:PSModulePath;
-    if (!(get-module -listavailable -name Az.accounts)) {
-        Write-Host "Az Module was not installed"; $env:PSModulePath = $actualPSModulePath; exit 1
-    }
     $env:PSModulePath = $actualPSModulePath'; then
     exit 1
 fi
@@ -49,5 +43,4 @@ echo "Lastly, documenting what we added to the metadata file"
 DocumentInstalledItem "Az Module (1.0.0)"
 DocumentInstalledItem "Az Module (1.6.0)"
 DocumentInstalledItem "Az Module (2.3.2)"
-DocumentInstalledItem "Az Module (2.6.0)"
-DocumentInstalledItem "Az Module (2.8.0)"
\ No newline at end of file
+DocumentInstalledItem "Az Module (2.6.0)"
\ No newline at end of file
diff --git a/images/linux/scripts/installers/1804/azpowershell.sh b/images/linux/scripts/installers/1804/azpowershell.sh
index ca41c3808..c843aa583 100644
--- a/images/linux/scripts/installers/1804/azpowershell.sh
+++ b/images/linux/scripts/installers/1804/azpowershell.sh
@@ -12,7 +12,6 @@ sudo pwsh -Command 'Save-Module -Name Az -LiteralPath /usr/share/az_1.0.0 -Requi
 sudo pwsh -Command 'Save-Module -Name Az -LiteralPath /usr/share/az_1.6.0 -RequiredVersion 1.6.0 -Force'
 sudo pwsh -Command 'Save-Module -Name Az -LiteralPath /usr/share/az_2.3.2 -RequiredVersion 2.3.2 -Force'
 sudo pwsh -Command 'Save-Module -Name Az -LiteralPath /usr/share/az_2.6.0 -RequiredVersion 2.6.0 -Force'
-sudo pwsh -Command 'Save-Module -Name Az -LiteralPath /usr/share/az_2.8.0 -RequiredVersion 2.8.0 -Force'
 
 # Run tests to determine that the software installed as expected
 echo "Testing to make sure that script performed as expected, and basic scenarios work"
@@ -35,11 +34,6 @@ if ! pwsh -Command '$actualPSModulePath = $env:PSModulePath ; $env:PSModulePath
     if (!(get-module -listavailable -name Az.accounts)) {
         Write-Host "Az Module was not installed"; $env:PSModulePath = $actualPSModulePath; exit 1
     }
-    $env:PSModulePath = $actualPSModulePath
-    $actualPSModulePath = $env:PSModulePath ; $env:PSModulePath = "/usr/share/az_2.8.0:" + $env:PSModulePath;
-    if (!(get-module -listavailable -name Az.accounts)) {
-        Write-Host "Az Module was not installed"; $env:PSModulePath = $actualPSModulePath; exit 1
-    }
     $env:PSModulePath = $actualPSModulePath'; then
     exit 1
 fi
@@ -50,4 +44,3 @@ DocumentInstalledItem "Az Module (1.0.0)"
 DocumentInstalledItem "Az Module (1.6.0)"
 DocumentInstalledItem "Az Module (2.3.2)"
 DocumentInstalledItem "Az Module (2.6.0)"
-DocumentInstalledItem "Az Module (2.8.0)"