From e8f418a36d154e03988daa8ca72331a58ec67bdc Mon Sep 17 00:00:00 2001 From: Aminda Suomalainen Date: Sun, 4 Aug 2024 09:00:48 +0300 Subject: [PATCH] bash/usr-local-bin/*: drop WebContentsForceDark and ozone platform hints --- bash/usr-local-bin/bitwarden | 2 +- bash/usr-local-bin/code | 8 ++++---- bash/usr-local-bin/code-insiders | 8 ++++---- bash/usr-local-bin/codium | 8 ++++---- bash/usr-local-bin/deltachat | 2 +- bash/usr-local-bin/element | 2 +- bash/usr-local-bin/element-tor | 2 +- bash/usr-local-bin/joplin-desktop | 2 +- bash/usr-local-bin/microsoft-teams | 2 +- bash/usr-local-bin/schildichat | 2 +- bash/usr-local-bin/schildichat-tor | 2 +- bash/usr-local-bin/signal-desktop | 2 +- bash/usr-local-bin/superproductivity | 4 ++-- bash/usr-local-bin/vivaldi | 2 +- 14 files changed, 24 insertions(+), 24 deletions(-) diff --git a/bash/usr-local-bin/bitwarden b/bash/usr-local-bin/bitwarden index ae1b944..476bcc7 100755 --- a/bash/usr-local-bin/bitwarden +++ b/bash/usr-local-bin/bitwarden @@ -4,6 +4,6 @@ set -x if [ -f /snap/bin/bitwarden ]; then # https://bugs.launchpad.net/ubuntu/+source/snapd/+bug/1951491/comments/104 export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/$(id -u)/bus - snap run bitwarden --ozone-platform=x11 --ozone-platform-hint=wayland --enable-features=WaylandWindowDecorations "$@" + snap run bitwarden --ozone-platform=x11 --enable-features=WaylandWindowDecorations "$@" fi set +x diff --git a/bash/usr-local-bin/code b/bash/usr-local-bin/code index a453873..a7c6cf2 100755 --- a/bash/usr-local-bin/code +++ b/bash/usr-local-bin/code @@ -5,20 +5,20 @@ set -x if [ -f /usr/bin/code ]; then - /usr/bin/code --verbose --enable-features=WaylandWindowDecorations,UseOzonePlatform,WebContentsForceDark --ozone-platform-hint=wayland "$@" + /usr/bin/code --verbose --enable-features=WaylandWindowDecorations,UseOzonePlatform --ozone-platform=wayland "$@" elif [ -f /snap/bin/code ]; then # https://bugs.launchpad.net/ubuntu/+source/snapd/+bug/1951491/comments/104 #unset DBUS_SESSION_BUS_ADDRESS # https://bugs.launchpad.net/ubuntu/+source/snapd/+bug/1951491/comments/105 #export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/$(id -u)/bus - snap run code --verbose --enable-features=WaylandWindowDecorations,UseOzonePlatform,WebContentsForceDark --ozone-platform-hint=x11 "$@" + snap run code --verbose --enable-features=WaylandWindowDecorations,UseOzonePlatform --ozone-platform=x11 "$@" elif [ -f ~/.local/share/flatpak/exports/bin/run/com.visualstudio.code ]; then - flatpak run --user com.visualstudio.code --verbose --no-sandbox --ozone-platform-hint=x11 --enable-features=WaylandWindowDecorations,WebContentsForceDark "$@" + flatpak run --user com.visualstudio.code --verbose --no-sandbox --ozone-platform=x11 --enable-features=WaylandWindowDecorations "$@" elif [ -f ~/.local/share/flatpak/exports/bin/run/com.visualstudio.code ]; then - flatpak run com.visualstudio.code --verbose --no-sandbox --ozone-platform-hint=x11 --enable-features=WaylandWindowDecorations,WebContentsForceDark "$@" + flatpak run com.visualstudio.code --verbose --no-sandbox --ozone-platform=x11 --enable-features=WaylandWindowDecorations "$@" else echo "code not found :(" diff --git a/bash/usr-local-bin/code-insiders b/bash/usr-local-bin/code-insiders index da63acc..ed4cb16 100755 --- a/bash/usr-local-bin/code-insiders +++ b/bash/usr-local-bin/code-insiders @@ -2,20 +2,20 @@ set -x if [ -f /usr/bin/code-insiders ]; then - /usr/bin/code-insiders --verbose --enable-features=WaylandWindowDecorations,UseOzonePlatform,WebContentsForceDark --ozone-platform-hint=auto "$@" + /usr/bin/code-insiders --verbose --enable-features=WaylandWindowDecorations,UseOzonePlatform --ozone-platform=wayland "$@" elif [ -f /snap/bin/code-insiders ]; then # https://bugs.launchpad.net/ubuntu/+source/snapd/+bug/1951491/comments/104 #unset DBUS_SESSION_BUS_ADDRESS # https://bugs.launchpad.net/ubuntu/+source/snapd/+bug/1951491/comments/105 #export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/$(id -u)/bus - snap run code-insiders --verbose --enable-features=WaylandWindowDecorations,UseOzonePlatform,WebContentsForceDark --ozone-platform-hint=auto "$@" + snap run code-insiders --verbose --enable-features=WaylandWindowDecorations,UseOzonePlatform --ozone-platform=wayland "$@" elif [ -f ~/.local/share/flatpak/exports/bin/run/com.visualstudio.code.insiders ]; then - flatpak run --user com.visualstudio.code.insiders --verbose --no-sandbox --ozone-platform-hint=auto --enable-features=WaylandWindowDecorations,WebContentsForceDark "$@" + flatpak run --user com.visualstudio.code.insiders --verbose --no-sandbox --ozone-platform=wayland --enable-features=WaylandWindowDecorations "$@" elif [ -f ~/.local/share/flatpak/exports/bin/run/com.visualstudio.code.insiders ]; then - flatpak run com.visualstudio.code.insiders --verbose --no-sandbox --ozone-platform-hint=auto --enable-features=WaylandWindowDecorations,WebContentsForceDark "$@" + flatpak run com.visualstudio.code.insiders --verbose --no-sandbox --ozone-platform=wayland --enable-features=WaylandWindowDecorations "$@" else echo "code not found :(" diff --git a/bash/usr-local-bin/codium b/bash/usr-local-bin/codium index 504ad0c..1398e90 100755 --- a/bash/usr-local-bin/codium +++ b/bash/usr-local-bin/codium @@ -5,20 +5,20 @@ set -x if [ -f /usr/bin/codium ]; then - /usr/bin/codium --verbose --enable-features=WaylandWindowDecorations,UseOzonePlatform,WebContentsForceDark --ozone-platform=wayland "$@" + /usr/bin/codium --verbose --enable-features=WaylandWindowDecorations,UseOzonePlatform --ozone-platform=wayland "$@" elif [ -f /snap/bin/codium ]; then # https://bugs.launchpad.net/ubuntu/+source/snapd/+bug/1951491/comments/104 #unset DBUS_SESSION_BUS_ADDRESS # https://bugs.launchpad.net/ubuntu/+source/snapd/+bug/1951491/comments/105 #export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/$(id -u)/bus - snap run codium --verbose --enable-features=WaylandWindowDecorations,UseOzonePlatform,WebContentsForceDark --ozone-platform=x11 "$@" + snap run codium --verbose --enable-features=WaylandWindowDecorations,UseOzonePlatform --ozone-platform=x11 "$@" elif [ -f ~/.local/share/flatpak/exports/bin/run/com.vscodium.codium ]; then - flatpak run --user com.vscodium.codium --verbose --no-sandbox --ozone-platform=x11 --enable-features=WaylandWindowDecorations,WebContentsForceDark "$@" + flatpak run --user com.vscodium.codium --verbose --no-sandbox --ozone-platform=x11 --enable-features=WaylandWindowDecorations "$@" elif [ -f ~/.local/share/flatpak/exports/bin/run/com.vscodium.codium ]; then - flatpak run com.vscodium.codium --verbose --no-sandbox --ozone-platform=x11 --enable-features=WaylandWindowDecorations,WebContentsForceDark "$@" + flatpak run com.vscodium.codium --verbose --no-sandbox --ozone-platform=x11 --enable-features=WaylandWindowDecorations "$@" else echo "codium not found :(" diff --git a/bash/usr-local-bin/deltachat b/bash/usr-local-bin/deltachat index 7e35145..fbd7990 100755 --- a/bash/usr-local-bin/deltachat +++ b/bash/usr-local-bin/deltachat @@ -1,4 +1,4 @@ #!/usr/bin/env bash set -x -flatpak run chat.delta.desktop --ozone-platform-hint=auto --enable-features=WaylandWindowDecorations,WebContentsForceDark "$@" +flatpak run chat.delta.desktop --ozone-platform=wayland --enable-features=WaylandWindowDecorations "$@" set +x diff --git a/bash/usr-local-bin/element b/bash/usr-local-bin/element index f857487..12df503 100755 --- a/bash/usr-local-bin/element +++ b/bash/usr-local-bin/element @@ -1,5 +1,5 @@ #!/usr/bin/env bash set -x -flatpak run im.riot.Riot --ozone-platform-hint=auto --enable-features=WaylandWindowDecorations,WebContentsForceDark "$@" +flatpak run im.riot.Riot --ozone-platform=wayland --enable-features=WaylandWindowDecorations "$@" set +x diff --git a/bash/usr-local-bin/element-tor b/bash/usr-local-bin/element-tor index 7073985..3e1bb52 100755 --- a/bash/usr-local-bin/element-tor +++ b/bash/usr-local-bin/element-tor @@ -3,5 +3,5 @@ set -x # proxy authentication is not supported # https://github.com/vector-im/element-web/issues/3320 -flatpak run --env=LC_ALL=en_US.utf8 --env=TZ=UTC im.riot.Riot --proxy-server=socks5://127.0.0.1:9050 --ozone-platform-hint=auto --enable-features=WaylandWindowDecorations,WebContentsForceDark "$@" +flatpak run --env=LC_ALL=en_US.utf8 --env=TZ=UTC im.riot.Riot --proxy-server=socks5://127.0.0.1:9050 --ozone-platform=wayland --enable-features=WaylandWindowDecorations "$@" set +x diff --git a/bash/usr-local-bin/joplin-desktop b/bash/usr-local-bin/joplin-desktop index 9169a97..a4b66c9 100755 --- a/bash/usr-local-bin/joplin-desktop +++ b/bash/usr-local-bin/joplin-desktop @@ -2,7 +2,7 @@ # I was unable to get the Flatpak to start and the Snap needed the usual, so # here we are. Then I learned that it just needs --ozone-platform=wayland -# instead of the old --ozone-platform-hint=auto, but whatever works or is +# instead of the old --ozone-platform=wayland, but whatever works or is # installed is fine... set -x diff --git a/bash/usr-local-bin/microsoft-teams b/bash/usr-local-bin/microsoft-teams index 6820c44..bdf0bea 100755 --- a/bash/usr-local-bin/microsoft-teams +++ b/bash/usr-local-bin/microsoft-teams @@ -1,5 +1,5 @@ #!/usr/bin/env bash set -x -flatpak run com.github.IsmaelMartinez.teams_for_linux --ozone-platform-hint=auto --enable-features=WaylandWindowDecorations,WebContentsForceDark "$@" +flatpak run com.github.IsmaelMartinez.teams_for_linux --ozone-platform=wayland --enable-features=WaylandWindowDecorations "$@" set +x diff --git a/bash/usr-local-bin/schildichat b/bash/usr-local-bin/schildichat index 09580e4..efbd979 100755 --- a/bash/usr-local-bin/schildichat +++ b/bash/usr-local-bin/schildichat @@ -1,5 +1,5 @@ #!/usr/bin/env bash set -x -flatpak run chat.schildi.desktop --ozone-platform-hint=auto --enable-features=WaylandWindowDecorations,WebContentsForceDark --system-theme-dark-override "$@" +flatpak run chat.schildi.desktop --ozone-platform=wayland --enable-features=WaylandWindowDecorations --system-theme-dark-override "$@" set +x diff --git a/bash/usr-local-bin/schildichat-tor b/bash/usr-local-bin/schildichat-tor index 125a04f..1748a41 100755 --- a/bash/usr-local-bin/schildichat-tor +++ b/bash/usr-local-bin/schildichat-tor @@ -3,5 +3,5 @@ set -x # proxy authentication is not supported # https://github.com/vector-im/element-web/issues/3320 -flatpak run --env=LC_ALL=en_US.utf8 --env=TZ=UTC chat.schildi.desktop --proxy-server=socks5://127.0.0.1:9050 --ozone-platform-hint=auto --enable-features=WaylandWindowDecorations,WebContentsForceDark --system-theme-dark-override "$@" +flatpak run --env=LC_ALL=en_US.utf8 --env=TZ=UTC chat.schildi.desktop --proxy-server=socks5://127.0.0.1:9050 --ozone-platform=wayland --enable-features=WaylandWindowDecorations --system-theme-dark-override "$@" set +x diff --git a/bash/usr-local-bin/signal-desktop b/bash/usr-local-bin/signal-desktop index a5fe252..6322b48 100755 --- a/bash/usr-local-bin/signal-desktop +++ b/bash/usr-local-bin/signal-desktop @@ -4,5 +4,5 @@ set -x # --start-in-tray - would be nice, but then I cannot open it from there, thus --use-tray-icon -flatpak run org.signal.Signal --use-tray-icon --ozone-platform-hint=auto --enable-features=WaylandWindowDecorations,WebContentsForceDark "$@" +flatpak run org.signal.Signal --use-tray-icon --ozone-platform=wayland --enable-features=WaylandWindowDecorations "$@" set +x diff --git a/bash/usr-local-bin/superproductivity b/bash/usr-local-bin/superproductivity index 6b55739..510ca19 100755 --- a/bash/usr-local-bin/superproductivity +++ b/bash/usr-local-bin/superproductivity @@ -3,8 +3,8 @@ set -x if [ -f /snap/bin/superproductivity ]; then # https://bugs.launchpad.net/ubuntu/+source/snapd/+bug/1951491/comments/105 export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/$(id -u)/bus - snap run superproductivity --ozone-platform-hint=auto --enable-features=WaylandWindowDecorations,WebContentsForceDark "$@" + snap run superproductivity --ozone-platform=wayland --enable-features=WaylandWindowDecorations "$@" else - /usr/bin/superproductivity --ozone-platform-hint=auto --enable-features=WaylandWindowDecorations,WebContentsForceDark "$@" + /usr/bin/superproductivity --ozone-platform=wayland --enable-features=WaylandWindowDecorations "$@" fi set +x diff --git a/bash/usr-local-bin/vivaldi b/bash/usr-local-bin/vivaldi index 810ea71..d706a7e 100755 --- a/bash/usr-local-bin/vivaldi +++ b/bash/usr-local-bin/vivaldi @@ -1,4 +1,4 @@ #!/usr/bin/env bash set -x -/usr/bin/vivaldi --ozone-platform=wayland --ozone-platform-hint=wayland --enable-features=WaylandWindowDecorations "$@" +/usr/bin/vivaldi --ozone-platform=wayland --enable-features=WaylandWindowDecorations "$@" set +x