From 2c0233f47c7723cf82d48e397038a5873dbcf7bd Mon Sep 17 00:00:00 2001 From: Anthony Perkins Date: Sat, 18 Mar 2023 19:52:34 +0000 Subject: [PATCH] Handle system Firefox again --- roles/home-gui/files/gnome-setup.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/roles/home-gui/files/gnome-setup.sh b/roles/home-gui/files/gnome-setup.sh index 8bdf541..f7af691 100644 --- a/roles/home-gui/files/gnome-setup.sh +++ b/roles/home-gui/files/gnome-setup.sh @@ -3,11 +3,18 @@ test -x /usr/bin/gsettings || (echo "gsettings not found" && exit 1) set_favorites_bar () { + local firefox + if [ -r /usr/share/applications/firefox-esr.desktop ] && [ ! -r /usr/share/applications/firefox.desktop ] + then + firefox=firefox-esr + else + firefox=firefox + fi if [ -r "${XDG_CONFIG_HOME:-$HOME/.config}/favorite-apps.conf" ] then gsettings set org.gnome.shell favorite-apps "$(cat "${XDG_CONFIG_HOME:-$HOME/.config}/favorite-apps.conf")" else - gsettings set org.gnome.shell favorite-apps "['org.gnome.Terminal.desktop', 'org.gnome.Console.desktop', 'org.gnome.Nautilus.desktop', 'org.mozilla.firefox.desktop', 'org.keepassxc.KeePassXC.desktop']" + gsettings set org.gnome.shell favorite-apps "['org.gnome.Terminal.desktop', 'org.gnome.Console.desktop', 'org.gnome.Nautilus.desktop', '$firefox.desktop', 'org.keepassxc.KeePassXC.desktop']" fi } set_favorites_bar