diff --git a/usr/bin/archboot-update.sh b/usr/bin/archboot-update.sh index 62b7a8711..c394c3b14 100755 --- a/usr/bin/archboot-update.sh +++ b/usr/bin/archboot-update.sh @@ -86,7 +86,7 @@ if [[ -n "${_L_XFCE}" || -n "${_L_SWAY}" || -n "${_L_PLASMA}" || -n "${_L_GNOME} echo "Setting up VNC and browser..." >"${_LOG}" [[ -n "${_L_XFCE}" ]] && _autostart_vnc if [[ "${_STANDARD_BROWSER}" == "firefox" ]]; then - pacman -Q chromium &>"${_NO_LOG}" && pacman -Rss --noconfirm chromium &">${_LOG}" + pacman -Q chromium &>"${_NO_LOG}" && pacman -Rss --noconfirm chromium &>"${_LOG}" pacman -Q firefox &>"${_NO_LOG}" || _run_pacman firefox # install firefox langpacks _LANG="be bg cs da de el fi fr hu it lt lv mk nl nn pl ro ru sk sr tr uk" @@ -108,13 +108,17 @@ if [[ -n "${_L_XFCE}" || -n "${_L_SWAY}" || -n "${_L_PLASMA}" || -n "${_L_GNOME} fi _firefox_flags else - pacman -Q firefox 2>"${_NO_LOG}" && pacman -Rss --noconfirm firefox + pacman -Q firefox 2>"${_NO_LOG}" && pacman -Rss --noconfirm firefox &>"${_LOG}" pacman -Q chromium 2>"${_NO_LOG}" || _run_pacman chromium _chromium_flags fi echo "Setting ${_STANDARD_BROWSER} as default browser..." - - #plasma + # gnome + if command -v gsettings &>"${_NO_LOG}"; then + [[ "${_STANDARD_BROWSER}" == "firefox" ]] && gsettings set org.gnome.shell favorite-apps "['org.gnome.Settings.desktop', 'org.gnome.Terminal.desktop', 'org.gnome.Nautilus.desktop', 'firefox.desktop', 'org.gnome.DiskUtility.desktop', 'gparted.desktop', 'archboot.desktop']" + [[ "${_STANDARD_BROWSER}" == "chromium" ]] && gsettings set org.gnome.shell favorite-apps "['org.gnome.Settings.desktop', 'org.gnome.Terminal.desktop', 'org.gnome.Nautilus.desktop', 'chromium.desktop', 'org.gnome.DiskUtility.desktop', 'gparted.desktop', 'archboot.desktop']" + fi + # plasma sed -i -e "s#applications:.*#applications:systemsettings.desktop,applications:org.kde.konsole.desktop,preferred://filemanager,applications:${_STANDARD_BROWSER}.desktop,applications:gparted.desktop,applications:archboot.desktop#g" /usr/share/plasma/plasmoids/org.kde.plasma.taskmanager/contents/config/main.xml 2>"${_NO_LOG}" # xfce sed -i -e "s#firefox#${_STANDARD_BROWSER}#g" /etc/xdg/xfce4/helpers.rc 2>"${_NO_LOG}"