From ce62a58d1f35326b24af07a8e75d3c2e74f0de97 Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Tue, 4 Feb 2020 13:58:37 +0300 Subject: [PATCH 1/4] add path to directory --- .../linux/scripts/installers/google-chrome.sh | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/images/linux/scripts/installers/google-chrome.sh b/images/linux/scripts/installers/google-chrome.sh index 20396e2a..71330b93 100644 --- a/images/linux/scripts/installers/google-chrome.sh +++ b/images/linux/scripts/installers/google-chrome.sh @@ -39,11 +39,18 @@ wget "https://chromedriver.storage.googleapis.com/$LATEST_CHROMEDRIVER_VERSION/c unzip chromedriver_linux64.zip rm chromedriver_linux64.zip -CHROMEDRIVER_BIN="/usr/bin/chromedriver" -mv "chromedriver" $CHROMEDRIVER_BIN -chown root:root $CHROMEDRIVER_BIN -chmod +x $CHROMEDRIVER_BIN -echo "CHROMEWEBDRIVER=$CHROMEDRIVER_BIN" | tee -a /etc/environment +CHROME_DRIVER="/usr/local/share/chrome_driver" + +if [ ! -d $CHROME_DRIVER ]; then + mkdir -p $CHROME_DRIVER; +fi + +CHROMEDRIVER_BIN="$CHROME_DRIVER/chromedriver" +mv "chromedriver" $CHROME_DRIVER +chown root:root $CHROME_DRIVER +chmod +x $CHROME_DRIVER +ln -s "$CHROMEDRIVER_BIN" /usr/bin/ +echo "CHROMEWEBDRIVER=$CHROME_DRIVER" | tee -a /etc/environment # Run tests to determine that the chromedriver installed as expected echo "Testing to make sure that script performed as expected, and basic scenarios work" From bb2a08df6ac68c7b8a997d0f7895f27d4f67a023 Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Tue, 4 Feb 2020 14:08:26 +0300 Subject: [PATCH 2/4] fix error to pass bin --- images/linux/scripts/installers/google-chrome.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/images/linux/scripts/installers/google-chrome.sh b/images/linux/scripts/installers/google-chrome.sh index 71330b93..e0479980 100644 --- a/images/linux/scripts/installers/google-chrome.sh +++ b/images/linux/scripts/installers/google-chrome.sh @@ -46,9 +46,9 @@ if [ ! -d $CHROME_DRIVER ]; then fi CHROMEDRIVER_BIN="$CHROME_DRIVER/chromedriver" -mv "chromedriver" $CHROME_DRIVER -chown root:root $CHROME_DRIVER -chmod +x $CHROME_DRIVER +mv "chromedriver" $CHROMEDRIVER_BIN +chown root:root $CHROMEDRIVER_BIN +chmod +x $CHROMEDRIVER_BIN ln -s "$CHROMEDRIVER_BIN" /usr/bin/ echo "CHROMEWEBDRIVER=$CHROME_DRIVER" | tee -a /etc/environment From e88a50287550ea4e6ab901fc0140f89c24e5582c Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Tue, 4 Feb 2020 15:39:21 +0300 Subject: [PATCH 3/4] update naming --- images/linux/scripts/installers/google-chrome.sh | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/images/linux/scripts/installers/google-chrome.sh b/images/linux/scripts/installers/google-chrome.sh index e0479980..3084629c 100644 --- a/images/linux/scripts/installers/google-chrome.sh +++ b/images/linux/scripts/installers/google-chrome.sh @@ -39,18 +39,15 @@ wget "https://chromedriver.storage.googleapis.com/$LATEST_CHROMEDRIVER_VERSION/c unzip chromedriver_linux64.zip rm chromedriver_linux64.zip -CHROME_DRIVER="/usr/local/share/chrome_driver" +CHROMEDRIVER_DIR="/usr/local/share/chrome_driver" +CHROMEDRIVER_BIN="$CHROMEDRIVER_DIR/chromedriver" -if [ ! -d $CHROME_DRIVER ]; then - mkdir -p $CHROME_DRIVER; -fi - -CHROMEDRIVER_BIN="$CHROME_DRIVER/chromedriver" +mkdir -p $CHROMEDRIVER_DIR mv "chromedriver" $CHROMEDRIVER_BIN chown root:root $CHROMEDRIVER_BIN chmod +x $CHROMEDRIVER_BIN ln -s "$CHROMEDRIVER_BIN" /usr/bin/ -echo "CHROMEWEBDRIVER=$CHROME_DRIVER" | tee -a /etc/environment +echo "CHROMEWEBDRIVER=$CHROMEDRIVER_DIR" | tee -a /etc/environment # Run tests to determine that the chromedriver installed as expected echo "Testing to make sure that script performed as expected, and basic scenarios work" From 6d1d8c3e48a5264e315b8c59817081d5d56ac60c Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Wed, 5 Feb 2020 16:50:58 +0300 Subject: [PATCH 4/4] remove chown --- images/linux/scripts/installers/google-chrome.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/images/linux/scripts/installers/google-chrome.sh b/images/linux/scripts/installers/google-chrome.sh index 3084629c..5d19a0f4 100644 --- a/images/linux/scripts/installers/google-chrome.sh +++ b/images/linux/scripts/installers/google-chrome.sh @@ -44,7 +44,6 @@ CHROMEDRIVER_BIN="$CHROMEDRIVER_DIR/chromedriver" mkdir -p $CHROMEDRIVER_DIR mv "chromedriver" $CHROMEDRIVER_BIN -chown root:root $CHROMEDRIVER_BIN chmod +x $CHROMEDRIVER_BIN ln -s "$CHROMEDRIVER_BIN" /usr/bin/ echo "CHROMEWEBDRIVER=$CHROMEDRIVER_DIR" | tee -a /etc/environment