From 7c5387d7d98fc2038634afeed9e4c311775bbd62 Mon Sep 17 00:00:00 2001 From: Justin Travis Date: Mon, 24 Mar 2025 12:15:37 +0000 Subject: [PATCH] Revert "Merge branch 'bugfix/KASM-7016-dark-google-chrome-theme' into 'develop'" This reverts merge request !247 --- src/ubuntu/install/chrome/install_chrome.sh | 6 +++--- src/ubuntu/install/slack/install_slack.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ubuntu/install/chrome/install_chrome.sh b/src/ubuntu/install/chrome/install_chrome.sh index 4f66f3f..5f192e7 100644 --- a/src/ubuntu/install/chrome/install_chrome.sh +++ b/src/ubuntu/install/chrome/install_chrome.sh @@ -1,14 +1,14 @@ #!/usr/bin/env bash set -ex -CHROME_ARGS="--password-store=basic --no-sandbox --ignore-gpu-blocklist --user-data-dir --no-first-run --disable-search-engine-choice-screen --simulate-outdated-no-au='Tue, 31 Dec 2099 23:59:59 GMT' --enable-features=WebContentsForceDark" +CHROME_ARGS="--password-store=basic --no-sandbox --ignore-gpu-blocklist --user-data-dir --no-first-run --disable-search-engine-choice-screen --simulate-outdated-no-au='Tue, 31 Dec 2099 23:59:59 GMT'" CHROME_VERSION=$1 ARCH=$(arch | sed 's/aarch64/arm64/g' | sed 's/x86_64/amd64/g') if [ "$ARCH" == "arm64" ] ; then echo "Chrome not supported on arm64, skipping Chrome installation" exit 0 -fi +fi if [[ "${DISTRO}" == @(centos|oracle8|rockylinux9|rockylinux8|oracle9|rhel9|almalinux9|almalinux8) ]]; then if [ ! -z "${CHROME_VERSION}" ]; then @@ -70,7 +70,7 @@ sed -i 's/"exited_cleanly":false/"exited_cleanly":true/' ~/.config/google-chrome sed -i 's/"exit_type":"Crashed"/"exit_type":"None"/' ~/.config/google-chrome/Default/Preferences if [ -f /opt/VirtualGL/bin/vglrun ] && [ ! -z "\${KASM_EGL_CARD}" ] && [ ! -z "\${KASM_RENDERD}" ] && [ -O "\${KASM_RENDERD}" ] && [ -O "\${KASM_EGL_CARD}" ] ; then echo "Starting Chrome with GPU Acceleration on EGL device \${KASM_EGL_CARD}" - vglrun -d "\${KASM_EGL_CARD}" /opt/google/chrome/google-chrome ${CHROME_ARGS} "\$@" + vglrun -d "\${KASM_EGL_CARD}" /opt/google/chrome/google-chrome ${CHROME_ARGS} "\$@" else echo "Starting Chrome" /opt/google/chrome/google-chrome ${CHROME_ARGS} "\$@" diff --git a/src/ubuntu/install/slack/install_slack.sh b/src/ubuntu/install/slack/install_slack.sh index 8aad392..8c69d23 100644 --- a/src/ubuntu/install/slack/install_slack.sh +++ b/src/ubuntu/install/slack/install_slack.sh @@ -8,7 +8,7 @@ if [ "${ARCH}" == "arm64" ] ; then fi # This might prove fragile depending on how often slack changes it's website. -version=$(wget -O- https://slack.com/downloads/linux | grep page-downloads__hero__meta-text__version | sed 's/.*Version //g' | cut -d "<" -f1 | head -1) +version=$(curl -q https://slack.com/downloads/linux | grep page-downloads__hero__meta-text__version | sed 's/.*Version //g' | cut -d "<" -f1 | head -1) echo Detected slack version $version