From 2039a2f9732f1df8811f1f3705e6eeb05239ec6c Mon Sep 17 00:00:00 2001 From: AndreyMaslennikov Date: Fri, 10 Jan 2020 10:47:44 +0300 Subject: [PATCH 1/3] Remove selenium from the CLASSPATH env variable --- images/linux/scripts/installers/google-chrome.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/images/linux/scripts/installers/google-chrome.sh b/images/linux/scripts/installers/google-chrome.sh index 7eedd165..6be67fb9 100644 --- a/images/linux/scripts/installers/google-chrome.sh +++ b/images/linux/scripts/installers/google-chrome.sh @@ -61,7 +61,7 @@ SELENIUM_VERSION_MAJOR_MINOR=$(echo $SELENIUM_VERSION | cut -d '.' -f 1,2) # Download selenium standalone server echo "Downloading selenium-server-standalone v$SELENIUM_VERSION..." -SELENIUM_JAR_NAME=selenium-server-standalone-$SELENIUM_VERSION.jar +SELENIUM_JAR_NAME="selenium-server-standalone-$SELENIUM_VERSION.jar" wget https://selenium-release.storage.googleapis.com/$SELENIUM_VERSION_MAJOR_MINOR/$SELENIUM_JAR_NAME echo "Testing to make sure that script performed as expected, and basic scenarios work" @@ -70,8 +70,9 @@ if [ ! -f "$SELENIUM_JAR_NAME" ]; then exit 1 fi -mv "selenium-server-standalone-$SELENIUM_VERSION.jar" "/usr/share/java/selenium-server-standalone.jar" -echo "CLASSPATH=/usr/share/java/selenium-server-standalone.jar:.:$CLASSPATH" | tee -a /etc/environment +SELENIUM_JAR_PATH="/usr/share/java/selenium-server-standalone.jar" +mv $SELENIUM_JAR_NAME $SELENIUM_JAR_PATH +echo "SELENIUM_JAR_PATH=$SELENIUM_JAR_PATH" | tee -a /etc/environment echo "Lastly, documenting what we added to the metadata file" DocumentInstalledItem "Selenium server standalone" From 0e0b1c1c289f694af987dad62e285fda075f9b83 Mon Sep 17 00:00:00 2001 From: AndreyMaslennikov Date: Fri, 10 Jan 2020 11:02:52 +0300 Subject: [PATCH 2/3] Update documentation --- images/linux/scripts/installers/google-chrome.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/scripts/installers/google-chrome.sh b/images/linux/scripts/installers/google-chrome.sh index 6be67fb9..9d6128f8 100644 --- a/images/linux/scripts/installers/google-chrome.sh +++ b/images/linux/scripts/installers/google-chrome.sh @@ -75,4 +75,4 @@ mv $SELENIUM_JAR_NAME $SELENIUM_JAR_PATH echo "SELENIUM_JAR_PATH=$SELENIUM_JAR_PATH" | tee -a /etc/environment echo "Lastly, documenting what we added to the metadata file" -DocumentInstalledItem "Selenium server standalone" +DocumentInstalledItem "Selenium server standalone (available via SELENIUM_JAR_PATH environment variable)" From ef3bb5ced7167296c398228f8cb192c2b86d1cdb Mon Sep 17 00:00:00 2001 From: AndreyMaslennikov Date: Fri, 10 Jan 2020 11:26:40 +0300 Subject: [PATCH 3/3] Remove selenium from the CLASSPATH on Windows image --- images/win/scripts/Installers/Install-Selenium.ps1 | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/images/win/scripts/Installers/Install-Selenium.ps1 b/images/win/scripts/Installers/Install-Selenium.ps1 index 9818f414..ac38c301 100644 --- a/images/win/scripts/Installers/Install-Selenium.ps1 +++ b/images/win/scripts/Installers/Install-Selenium.ps1 @@ -29,8 +29,7 @@ try { exit 1 } -Write-Host "Add selenium to CLASSPATH..." -setx "CLASSPATH" "$($seleniumBinPath);$($env:CLASSPATH)" /M -Write-Host "CLASSPATH: $($seleniumBinPath);$($env:CLASSPATH)" +Write-Host "Add selenium jar to the environment variables..." +setx "SELENIUM_JAR_PATH" "$($seleniumBinPath)" /M exit 0