From e42157cddd48354ec37f8ae70f0cd9294a5366ff Mon Sep 17 00:00:00 2001 From: Ark74 Date: Tue, 22 Aug 2023 20:22:24 -0600 Subject: [PATCH] quick_jibri_installer.sh: rearrange chromedriver variables. --- quick_jibri_installer.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/quick_jibri_installer.sh b/quick_jibri_installer.sh index de82e78..2233b76 100644 --- a/quick_jibri_installer.sh +++ b/quick_jibri_installer.sh @@ -404,12 +404,6 @@ elif [ "$(npm list -g esprima 2>/dev/null | grep -c "esprima")" == "1" ]; then echo "Good. Esprima package is already installed" fi -G_CHROME=$(apt-cache madison google-chrome-stable|awk '{print$3}'|cut -d. -f1-3) -CHROMELAB_URL="https://googlechromelabs.github.io/chrome-for-testing" -CHD_LTST_DWNL=$(curl -s $CHROMELAB_URL/known-good-versions-with-downloads.json | jq -r ".versions[].downloads.chromedriver | select(. != null) | .[].url" | grep linux64 | grep "$G_CHROME" | tail -1) -CHD_LTST=$(awk -F '/' '{print$7}' <<< "$CHD_LTST_DWNL") -GCMP_JSON="/etc/opt/chrome/policies/managed/managed_policies.json" - echo "# Installing Google Chrome / ChromeDriver" if [ "$GOOGLE_ACTIVE_REPO" = "main" ]; then echo "Google repository already set." @@ -423,6 +417,12 @@ apt-get -q2 update apt-get install -yq2 google-chrome-stable rm -rf /etc/apt/sources.list.d/dl_google_com_linux_chrome_deb.list +G_CHROME=$(apt-cache madison google-chrome-stable|awk '{print$3}'|cut -d. -f1-3) +CHROMELAB_URL="https://googlechromelabs.github.io/chrome-for-testing" +CHD_LTST_DWNL=$(curl -s $CHROMELAB_URL/known-good-versions-with-downloads.json | jq -r ".versions[].downloads.chromedriver | select(. != null) | .[].url" | grep linux64 | grep "$G_CHROME" | tail -1) +CHD_LTST=$(awk -F '/' '{print$7}' <<< "$CHD_LTST_DWNL") +GCMP_JSON="/etc/opt/chrome/policies/managed/managed_policies.json" + if [ -f /usr/local/bin/chromedriver ]; then echo "Chromedriver already installed." else