From e4cee0c52769a6de43dbdd81914a0c7b82fdb32e Mon Sep 17 00:00:00 2001
From: Dmitry Shibanov <“shibanov-1997@inbox.ru”>
Date: Wed, 12 Feb 2020 18:02:47 +0300
Subject: [PATCH] move directories to other folder

---
 .../win/scripts/Installers/Install-Firefox.ps1   |  5 ++---
 .../Installers/Install-SeleniumWebDrivers.ps1    | 16 +++++++++++-----
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/images/win/scripts/Installers/Install-Firefox.ps1 b/images/win/scripts/Installers/Install-Firefox.ps1
index ff70fc78..abf234cb 100644
--- a/images/win/scripts/Installers/Install-Firefox.ps1
+++ b/images/win/scripts/Installers/Install-Firefox.ps1
@@ -4,7 +4,6 @@
 ################################################################################
 
 Import-Module -Name ImageHelpers -Force
-Import-Module -Name PathHelpers -Force
 
 $temp_install_dir = 'C:\Windows\Installer'
 New-Item -Path $temp_install_dir -ItemType Directory -Force
@@ -47,9 +46,9 @@ if (-not (Test-Path -Path $FireFoxDriverPath)) {
 }
 
 $DestFile = Join-Path $FireFoxDriverPath $DriversZipFile
-$EdgeDriverDownloadUrl = $geckodriverWindowsAsset.browser_download_url
+$FireFoxDriverDownloadUrl = $geckodriverWindowsAsset.browser_download_url
 try{
-    Invoke-WebRequest -Uri $EdgeDriverDownloadUrl -OutFile $DestFile
+    Invoke-WebRequest -Uri $FireFoxDriverDownloadUrl -OutFile $DestFile
 } catch {
     Write-Error "[!] Failed to download $DriversZipFile"
     exit 1
diff --git a/images/win/scripts/Installers/Install-SeleniumWebDrivers.ps1 b/images/win/scripts/Installers/Install-SeleniumWebDrivers.ps1
index aadae2c8..d1febb46 100644
--- a/images/win/scripts/Installers/Install-SeleniumWebDrivers.ps1
+++ b/images/win/scripts/Installers/Install-SeleniumWebDrivers.ps1
@@ -14,12 +14,19 @@ catch {
     exit 1;
 }
 
-Expand-Archive -Path $DriversZipFile -DestinationPath $DestinationPath -Force;
-Remove-Item $DriversZipFile;
+Expand-Archive -Path $DriversZipFile -DestinationPath $env:TEMP -Force;
 
+$SeleniumWebDriverPath = Join-Path $DestinationPath "SeleniumWebDrivers"
+Remove-Item $DriversZipFile;
 $ChromeDriverPath = "${DestinationPath}SeleniumWebDrivers\ChromeDriver";
-Write-Host "Chrome driver path: [$ChromeDriverPath]";
-Remove-Item -Path "$ChromeDriverPath\*" -Force;
+$EdgeDriverPathTemp = Join-Path $Env:TEMP 'EdgeDriver'
+$IEDriverPathTemp = Join-Path $Env:TEMP 'IEDriver'
+$ChromeDriverPathTemp = Join-Path $Env:TEMP 'ChromeDriver'
+Remove-Item -Path "$ChromeDriverPathTemp\*" -Force;
+Move-Item -Path "$EdgeDriverPathTemp" -Destination $SeleniumWebDriverPath
+Move-Item -Path "$IEDriverPathTemp" -Destination $SeleniumWebDriverPath
+Move-Item -Path "$ChromeDriverPathTemp" -Destination $SeleniumWebDriverPath
+
 
 # Reinstall Chrome Web Driver
 $RegistryPath = "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths"
@@ -71,7 +78,6 @@ Remove-Item -Path $DestFile -Force
 Write-Host "Setting the environment variables"
 
 setx IEWebDriver "C:\SeleniumWebDrivers\IEDriver" /M;
-setx GeckoWebDriver "C:\SeleniumWebDrivers\GeckoDriver" /M;
 setx ChromeWebDriver "$ChromeDriverPath" /M;
 setx EdgeWebDriver "$EdgeDriverPath" /M;