conditionals

Signed-off-by: Kawika Avilla <kavilla414@gmail.com>
opensearch-project · May 9, 2023 · 7ca5197 · 7ca5197
1 parent 933b2bf
commit 7ca5197
Showing 1 changed file with 17 additions and 7 deletions.
diff --git a/scripts/upgrade_chromedriver.js b/scripts/upgrade_chromedriver.js
@@ -25,19 +25,34 @@ const versionCheckCommands = [];
 switch (process.platform) {
   case 'win32':
     versionCheckCommands.push(
-      'powershell "(Get-Item \\"$Env:Programfiles/Google/Chrome/Application/chrome.exe\\").VersionInfo.FileVersion"'
+      ...[
+        ...(process.env.TEST_BROWSER_BINARY_PATH
+          ? [
+              `powershell "(Get-Item \\"${process.env.TEST_BROWSER_BINARY_PATH}\\").VersionInfo.FileVersion"`,
+            ]
+          : []),
+        'powershell "(Get-Item \\"$Env:Programfiles/Google/Chrome/Application/chrome.exe\\").VersionInfo.FileVersion"',
+      ]
     );
     break;
 
   case 'darwin':
     versionCheckCommands.push(
-      '/Applications/Google\\ Chrome.app/Contents/MacOS/Google\\ Chrome --version'
+      ...[
+        ...(process.env.TEST_BROWSER_BINARY_PATH
+          ? [`${process.env.TEST_BROWSER_BINARY_PATH} --version`]
+          : []),
+        '/Applications/Google\\ Chrome.app/Contents/MacOS/Google\\ Chrome --version',
+      ]
     );
     break;
 
   default:
     versionCheckCommands.push(
       ...[
+        ...(process.env.TEST_BROWSER_BINARY_PATH
+          ? [`${process.env.TEST_BROWSER_BINARY_PATH}`]
+          : []),
         '/usr/bin',
         '/usr/local/bin',
         '/usr/sbin',
@@ -56,11 +71,6 @@ switch (process.platform) {
     );
 }
 
-if (process.env.TEST_BROWSER_BINARY_PATH) {
-  console.log(`Installing from path ${process.env.TEST_BROWSER_BINARY_PATH}`);
-  versionCheckCommands.unshift(`${process.env.TEST_BROWSER_BINARY_PATH} --version`);
-}
-
 let versionCheckOutput;
 versionCheckCommands.some((cmd) => {
   try {