diff --git a/system_files/deck/shared/usr/share/ublue-os/just/custom.just b/system_files/deck/shared/usr/share/ublue-os/just/custom.just index 0e16d546..b55ea051 100644 --- a/system_files/deck/shared/usr/share/ublue-os/just/custom.just +++ b/system_files/deck/shared/usr/share/ublue-os/just/custom.just @@ -58,7 +58,7 @@ enable-vapor-theme: #!/usr/bin/env bash source /etc/default/bazzite if [[ ${BASE_IMAGE_NAME} == 'silverblue' ]]; then - gnome-shell-extension-cl -e user-theme@gnome-shell-extensions.gcampax.github.com + gnome-extensions enable user-theme@gnome-shell-extensions.gcampax.github.com gsettings set org.gnome.desktop.wm.preferences button-layout appmenu:minimize,maximize,close gsettings set org.gnome.desktop.interface color-scheme prefer-dark gsettings set org.gnome.desktop.interface gtk-theme adw-gtk3-dark @@ -74,7 +74,7 @@ enable-vgui2-theme: #!/usr/bin/env bash source /etc/default/bazzite if [[ ${BASE_IMAGE_NAME} == 'silverblue' ]]; then - gnome-shell-extension-cl -e user-theme@gnome-shell-extensions.gcampax.github.com + gnome-extensions enable user-theme@gnome-shell-extensions.gcampax.github.com gsettings set org.gnome.desktop.wm.preferences button-layout appmenu:minimize,maximize,close gsettings set org.gnome.desktop.interface color-scheme prefer-dark gsettings set org.gnome.desktop.interface gtk-theme adw-gtk3-dark diff --git a/system_files/desktop/shared/usr/bin/bazzite-user-setup b/system_files/desktop/shared/usr/bin/bazzite-user-setup index 3b48c49c..826cbcd2 100755 --- a/system_files/desktop/shared/usr/bin/bazzite-user-setup +++ b/system_files/desktop/shared/usr/bin/bazzite-user-setup @@ -21,9 +21,9 @@ else echo 'Running setup for Silverblue' echo 'Enabling GNOME extensions' - gnome-shell-extension-cl -e s76-scheduler@mattjakeman.com - gnome-shell-extension-cl -d background-logo@fedorahosted.org - gnome-shell-extension-cl -e gsconnect@andyholmes.github.io + gnome-extensions enable s76-scheduler@mattjakeman.com + gnome-extensions enable gsconnect@andyholmes.github.io + gnome-extensions disable background-logo@fedorahosted.org echo 'Enabling VRR' gsettings set org.gnome.mutter experimental-features "['variable-refresh-rate']" @@ -38,7 +38,7 @@ else echo 'Enabling Bazzite tofu menu fork' gsettings set org.gnome.shell.extensions.fedora-menu menu-button-icon-size 20 - gnome-shell-extension-cl -e tofumenu@tofu + gnome-extensions enable tofumenu@tofu fi fi diff --git a/system_files/desktop/shared/usr/share/ublue-os/just/custom.just b/system_files/desktop/shared/usr/share/ublue-os/just/custom.just index 2b9ffaf7..2b1e2f41 100644 --- a/system_files/desktop/shared/usr/share/ublue-os/just/custom.just +++ b/system_files/desktop/shared/usr/share/ublue-os/just/custom.just @@ -62,7 +62,7 @@ enable-vapor-theme: #!/usr/bin/env bash source /etc/default/bazzite if [[ ${BASE_IMAGE_NAME} == 'silverblue' ]]; then - gnome-shell-extension-cl -e user-theme@gnome-shell-extensions.gcampax.github.com + gnome-extensions enable user-theme@gnome-shell-extensions.gcampax.github.com gsettings set org.gnome.desktop.wm.preferences button-layout appmenu:minimize,maximize,close gsettings set org.gnome.desktop.interface color-scheme prefer-dark gsettings set org.gnome.desktop.interface gtk-theme adw-gtk3-dark @@ -80,7 +80,7 @@ enable-vgui2-theme: #!/usr/bin/env bash source /etc/default/bazzite if [[ ${BASE_IMAGE_NAME} == 'silverblue' ]]; then - gnome-shell-extension-cl -e user-theme@gnome-shell-extensions.gcampax.github.com + gnome-extensions enable user-theme@gnome-shell-extensions.gcampax.github.com gsettings set org.gnome.desktop.wm.preferences button-layout appmenu:minimize,maximize,close gsettings set org.gnome.desktop.interface color-scheme prefer-dark gsettings set org.gnome.desktop.interface gtk-theme adw-gtk3-dark diff --git a/system_files/desktop/silverblue/usr/bin/gnome-shell-extension-cl b/system_files/desktop/silverblue/usr/bin/gnome-shell-extension-cl deleted file mode 100755 index 1871e212..00000000 --- a/system_files/desktop/silverblue/usr/bin/gnome-shell-extension-cl +++ /dev/null @@ -1,275 +0,0 @@ -#! /usr/bin/env bash - -# Copyright (C) 2016 -# Alexandru Catalin Petrini -# This script is intended to usefully manage gnome-shell extensions, -# in compatible Gnome Shell versions. - -# Install this script by running this command: -# $ sudo wget https://raw.githubusercontent.com/cyberalex4life/gnome-shell-extension-cl/master/gnome-shell-extension-cl -O /usr/local/bin/gnome-shell-extension-cl && sudo chmod +x /usr/local/bin/gnome-shell-extension-cl - - -# ------------------------------------------------------------------------------- - -function get_enabled_extensions() { - enabled_extensions=( $(gsettings get org.gnome.shell enabled-extensions | \ - sed -e 's|^@as ||g' | tr -d "[",",","]","\'") ) -} - - -function print_enabled_extensions(){ - get_enabled_extensions - for enabled_extension in "${enabled_extensions[@]}" - do - echo "$enabled_extension" - done -} - - -# ------------------------------------------------------------------------------- - -function get_installed_extensions() { - global_installed_extensions=( $(find "/usr/share/gnome-shell/extensions/" \ - -maxdepth 1 -type d -name "*@*" -exec \ - /usr/bin/basename {} \;) ) - local_installed_extensions=( $(find "$HOME/.local/share/gnome-shell/extensions/" \ - -maxdepth 1 -type d -name "*@*" -exec \ - /usr/bin/basename {} \;) ) - - if [ ${#local_installed_extensions[@]} -gt ${#global_installed_extensions[@]} ] - then - installed_extensions=( ${local_installed_extensions[@]} ) - test_extensions=( ${global_installed_extensions[@]} ) - else - installed_extensions=( ${global_installed_extensions[@]} ) - test_extensions=( ${local_installed_extensions[@]} ) - fi - for test_extension in "${test_extensions[@]}" - do - test_extension_not_doubled=true - for installed_extension in "${installed_extensions[@]}" - do - if [ "$test_extension" = "$installed_extension" ] - then - test_extension_not_doubled=false - break - fi - done - if [ $test_extension_not_doubled = true ] - then - test_extension=( $test_extension ) - installed_extensions=( "${installed_extensions[@]}" "${test_extension[@]}" ) - #echo ${test_extension[@]} - fi - done - echo "${installed_extensions[@]}" -} - - -function print_installed_extensions() { - installed_extensions=( $(get_installed_extensions) ) - for installed_extension in "${installed_extensions[@]}" - do - [ "$(check_extension_is_enabled "$installed_extension")" = true ] && \ - status="enabled" || status="disabled"; - printf "%-65s - %-10s \n" "$installed_extension" "$status" - done -} - - -# ------------------------------------------------------------------------------- - -function check_extension_is_enabled() { - extension_to_check=$1 - enabled_extensions=( $(gsettings get org.gnome.shell enabled-extensions | \ - sed -e 's|^@as ||g' | tr -d "[",",","]","\'") ) - for enabled_extension in "${enabled_extensions[@]}" - do - if [ "$enabled_extension" = "$extension_to_check" ] - then - echo true - return - fi - done - echo false -} - - -function check_extension_in_all_extensions() { - extension_to_check=$1 - installed_extensions=( $(get_installed_extensions) ) - for installed_extension in "${installed_extensions[@]}" - do - if [ "$installed_extension" = "$extension_to_check" ] - then - echo true - return - fi - done - echo false -} - - -function version_greater() { - minimal_version=3.18.0 - our_version=$(gnome-shell --version | awk '{print $3}') - if [ "$(echo "$our_version $minimal_version" | tr " " "\n" | sort -V | head -n 1)" != "$our_version" ] - then - echo true - else - echo false - fi -} - - -function disable_extension() { - - arguments=("$@") - unset "arguments[0]" - - for extension_to_disable in "${arguments[@]}" - do - - if [ "$(check_extension_in_all_extensions "$extension_to_disable")" = false ] - then - echo "'$extension_to_disable' is not installed." - continue - fi - if [ "$(check_extension_is_enabled "$extension_to_disable")" = false ] - then - echo "'$extension_to_disable' is already disabled." - continue - fi - if [ "$(version_greater)" = true ] - then - gnome-shell-extension-tool -d "$extension_to_disable" - continue - fi - enabled_extensions=( $(gsettings get org.gnome.shell enabled-extensions | \ - tr -d "[",",","]","\'") ) - enabled_extensions_string="" - for enabled_extension in "${enabled_extensions[@]}" - do - if [ "$enabled_extension" != "$extension_to_disable" ] - then - enabled_extensions_string="$enabled_extensions_string '$enabled_extension', " - fi - done - enabled_extensions_string=${enabled_extensions_string:1:-2} - enabled_extensions_string="[ $enabled_extensions_string ]" - - dbus-launch gsettings set org.gnome.shell enabled-extensions "$enabled_extensions_string" - - done - return -} - - -function enable_extension() { - - arguments=("$@") - unset "arguments[0]" - - for extension_to_enable in "${arguments[@]}" - do - - if [ "$(check_extension_in_all_extensions "$extension_to_enable")" = false ] - then - echo "'$extension_to_enable' is not installed." - continue - fi - if [ "$(check_extension_is_enabled "$extension_to_enable")" = true ] - then - echo "'$extension_to_enable' is already enabled." - continue - fi - if [ "$(version_greater)" = true ] - then - gnome-shell-extension-tool -e "$extension_to_enable" - continue - fi - enabled_extensions_string=$(gsettings get org.gnome.shell enabled-extensions | tr -d "]") - [ "$enabled_extensions_string" != "@as [" ] && delimiter=, - enabled_extensions_string="${enabled_extensions_string}${delimiter} '$extension_to_enable' ]" - - gsettings set org.gnome.shell enabled-extensions "$enabled_extensions_string" - - done - return -} - - -# ------------------------------------------------------------------------------- - -function disable_all_extensions() { - get_enabled_extensions - for enabled_extension in "${enabled_extensions[@]}" - do - # Don't disable user-theme extensions to avoid breaking them - if [ "$enabled_extension" != "user-theme" ] && \ - [ "$enabled_extension" != "user-themes" ] && \ - [ "$enabled_extension" != "user-theme@gnome-shell-extensions.gcampax.github.com" ] - then - disable_extension "this element will be ignored" "$enabled_extension" - else - continue - fi - done -} - - -# ------------------------------------------------------------------------------- - -function print_help() { - - printf " -GNOME Shell Extension Control Tool: - -usage: gnome-shell-extensions