Skip to content

Commit c98f615

Browse files
committed
updates & fixes
1 parent ccccd42 commit c98f615

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

commands/chrome-system-check.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ echo ${SYSTEMCHROMEDRIVER}
1111
printf "${GREEN}Laravel Chromedriver version: ${NC}"
1212
LARAVELCHROMEDRIVER=`$(pwd)/vendor/laravel/dusk/bin/chromedriver-linux --version | grep -iEo -m 1 "[0-9]{1,3}.[0-9]{1,3}" | head -1`
1313
echo ${LARAVELCHROMEDRIVER}
14-
# php /usr/bin/dusk-versions-check.php ${SYSTEMCHROME} ${SYSTEMCHROMEDRIVER} ${LARAVELCHROMEDRIVER} 1
15-
COMPATIBLE=`php /usr/bin/dusk-versions-check.php ${SYSTEMCHROME} ${SYSTEMCHROMEDRIVER} ${LARAVELCHROMEDRIVER} 1`
14+
php /usr/bin/dusk-versions-check.php ${SYSTEMCHROME} ${SYSTEMCHROMEDRIVER} ${LARAVELCHROMEDRIVER} 1
15+
COMPATIBLE=`php /usr/bin/dusk-versions-check.php ${SYSTEMCHROME} ${SYSTEMCHROMEDRIVER} ${LARAVELCHROMEDRIVER} 0`
1616
print "${COMPATIBLE}"
1717
if [${COMPATIBLE} == "INCOMPATIBLE"]; then
1818
printf "${GREEN}Starting system Chromedriver (${SYSTEMCHROMEDRIVER}).\n"

commands/dusk-versions-check.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
$system_chrome = $argv[1];
88
$system_chromedriver = $argv[2];
99
$laravel_chromedriver = $argv[3];
10-
$print_info = $argv[4];
10+
$print_info_only = $argv[4];
1111

1212
$compatible = FALSE;
1313
if ($system_chromedriver == $laravel_chromedriver) {
@@ -20,7 +20,7 @@
2020
}
2121
}
2222
}
23-
if ($print_info) {
23+
if ($print_info_only) {
2424
if ($compatible) {
2525
print $green."Laravel Chromedriver check => PASSED OK.".PHP_EOL;
2626
print $yellow."You can use both Chromedriver shipped with Laravel (".$laravel_chromedriver.") or system Chromeriver (".$system_chromedriver.")".PHP_EOL;
@@ -34,5 +34,7 @@
3434
print $yellow."You can read more, about running tests with systems inbuilt chromedriver in laravel-dusk-ci docs.".PHP_EOL;
3535
}
3636
print $nocolor;
37+
} else {
38+
print ($compatible?"OK":"INCOMPATIBLE");
3739
}
38-
print ($compatible?"OK":"INCOMPATIBLE");
40+

0 commit comments

Comments
 (0)