From cb0d885e4676e0669effb8368b592d0723adbb27 Mon Sep 17 00:00:00 2001 From: Tobias Powalowski Date: Sun, 25 Sep 2022 13:23:19 +0200 Subject: [PATCH] add _STANDARD_BROWSER switch, use firefox as default browser --- etc/archboot/defaults | 2 ++ usr/lib/archboot/common.sh | 2 +- usr/lib/archboot/gnome-wayland.sh | 3 ++- usr/lib/archboot/gnome.sh | 3 ++- usr/lib/archboot/plasma-wayland.sh | 3 ++- usr/lib/archboot/plasma.sh | 3 ++- usr/lib/archboot/update-installer.sh | 10 ++++++---- usr/lib/archboot/xfce.sh | 8 +++----- 8 files changed, 20 insertions(+), 14 deletions(-) diff --git a/etc/archboot/defaults b/etc/archboot/defaults index 51e246b05..2cca761b6 100644 --- a/etc/archboot/defaults +++ b/etc/archboot/defaults @@ -9,6 +9,8 @@ _GRUB_BACKGROUND="/usr/share/archboot/grub/archboot-background.png" _GRAPHIC_IGNORE="linux linux-firmware linux-firmware-marvell" # VNC password _VNC_PW="archboot" +### Standard Web Browser: chromium or firefox +_STANDARD_BROWSER="firefox" ### XFCE defaults # Xfce packages _XFCE_PACKAGES="xfce4 breeze-icons gvfs-smb thunar-archive-plugin file-roller gnome-keyring mousepad ristretto" diff --git a/usr/lib/archboot/common.sh b/usr/lib/archboot/common.sh index fbb4f56fe..8b2248271 100644 --- a/usr/lib/archboot/common.sh +++ b/usr/lib/archboot/common.sh @@ -11,7 +11,7 @@ _XORG_PACKAGE="xorg" _VNC_PACKAGE="tigervnc" _WAYLAND_PACKAGE="egl-wayland" _STANDARD_PACKAGES="gparted nss-mdns" -_STANDARD_BROWSER="chromium" +# chromium is now working on riscv64 [[ "${_RUNNING_ARCH}" == "riscv64" ]] && _STANDARD_BROWSER="firefox" _GRAPHICAL_PACKAGES="${_XORG_PACKAGE} ${_WAYLAND_PACKAGE} ${_VNC_PACKAGE} ${_STANDARD_PACKAGES} ${_STANDARD_BROWSER} ${_XFCE_PACKAGES} ${_GNOME_PACKAGES} ${_PLASMA_PACKAGES}" diff --git a/usr/lib/archboot/gnome-wayland.sh b/usr/lib/archboot/gnome-wayland.sh index 90c1f7b6e..2c68c124f 100644 --- a/usr/lib/archboot/gnome-wayland.sh +++ b/usr/lib/archboot/gnome-wayland.sh @@ -1,5 +1,6 @@ #!/bin/bash # created by Tobias Powalowski +. /etc/archboot/defaults _install_gnome_wayland() { if ! [[ -e /usr/bin/gnome-session ]]; then @@ -18,7 +19,7 @@ _install_gnome_wayland() { _configure_gnome_wayland() { echo "Configuring Gnome ..." - 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']" + gsettings set org.gnome.shell favorite-apps "['org.gnome.Settings.desktop', 'org.gnome.Terminal.desktop', 'org.gnome.Nautilus.desktop', "${_STANDARD_BROWSER}.desktop", 'org.gnome.DiskUtility.desktop', 'gparted.desktop', 'archboot.desktop']" echo "Setting wallpaper ..." gsettings set org.gnome.desktop.background picture-uri file:////usr/share/archboot/grub/archboot-background.png echo "Autostarting setup ..." diff --git a/usr/lib/archboot/gnome.sh b/usr/lib/archboot/gnome.sh index 9ebec1902..fa847433e 100644 --- a/usr/lib/archboot/gnome.sh +++ b/usr/lib/archboot/gnome.sh @@ -1,5 +1,6 @@ #!/bin/bash # created by Tobias Powalowski +. /etc/archboot/defaults _install_gnome() { if ! [[ -e /usr/bin/gnome-session ]]; then @@ -18,7 +19,7 @@ _install_gnome() { _configure_gnome() { echo "Configuring Gnome ..." - 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']" + gsettings set org.gnome.shell favorite-apps "['org.gnome.Settings.desktop', 'org.gnome.Terminal.desktop', 'org.gnome.Nautilus.desktop', "${_STANDARD_BROWSER}.desktop", 'org.gnome.DiskUtility.desktop', 'gparted.desktop', 'archboot.desktop']" echo "Setting wallpaper ..." gsettings set org.gnome.desktop.background picture-uri file:////usr/share/archboot/grub/archboot-background.png echo "Autostarting setup ..." diff --git a/usr/lib/archboot/plasma-wayland.sh b/usr/lib/archboot/plasma-wayland.sh index 8a85b8470..9d084333f 100644 --- a/usr/lib/archboot/plasma-wayland.sh +++ b/usr/lib/archboot/plasma-wayland.sh @@ -1,5 +1,6 @@ #!/bin/bash # created by Tobias Powalowski +. /etc/archboot/defaults _install_kde_wayland() { if ! [[ -e /usr/bin/startplasma-x11 ]]; then @@ -53,7 +54,7 @@ _configure_kde_wayland() { archboot.desktop - chromium.desktop + ${_STANDARD_BROWSER}.desktop org.kde.dolphin.desktop gparted.desktop org.kde.konsole.desktop diff --git a/usr/lib/archboot/plasma.sh b/usr/lib/archboot/plasma.sh index 6151f3774..3f4b07624 100644 --- a/usr/lib/archboot/plasma.sh +++ b/usr/lib/archboot/plasma.sh @@ -1,5 +1,6 @@ #!/bin/bash # created by Tobias Powalowski +. /etc/archboot/defaults _install_kde() { if ! [[ -e /usr/bin/startplasma-x11 ]]; then @@ -53,7 +54,7 @@ _configure_kde() { archboot.desktop - chromium.desktop + ${_STANDARD_BROWSER}.desktop org.kde.dolphin.desktop gparted.desktop org.kde.konsole.desktop diff --git a/usr/lib/archboot/update-installer.sh b/usr/lib/archboot/update-installer.sh index 03c14bbb5..57d9f1204 100644 --- a/usr/lib/archboot/update-installer.sh +++ b/usr/lib/archboot/update-installer.sh @@ -376,14 +376,16 @@ EOF } _firefox_flags() { -if ! grep -q startup usr/lib/firefox/browser/defaults/preferences/vendor.js; then - echo "Adding firefox flags vendor.js ..." - cat << EOF >> usr/lib/firefox/browser/defaults/preferences/vendor.js + if [[ -f "/usr/lib/firefox/browser/defaults/preferences/vendor.js" ]]; then + if ! grep -q startup /usr/lib/firefox/browser/defaults/preferences/vendor.js; then + echo "Adding firefox flags vendor.js ..." + cat << EOF >> /usr/lib/firefox/browser/defaults/preferences/vendor.js pref("browser.aboutwelcome.enabled", false, locked); pref("browser.startup.homepage_override.once", false, locked); pref("datareporting.policy.firstRunURL", "https://bit.ly/archboot", locked); EOF -fi + fi + fi } _autostart_vnc() { diff --git a/usr/lib/archboot/xfce.sh b/usr/lib/archboot/xfce.sh index 3c958bce8..5747becc3 100644 --- a/usr/lib/archboot/xfce.sh +++ b/usr/lib/archboot/xfce.sh @@ -1,5 +1,6 @@ #!/bin/bash # created by Tobias Powalowski +. /etc/archboot/defaults _install_xfce() { if ! [[ -e /usr/bin/startxfce4 ]]; then @@ -171,11 +172,8 @@ EOF sed -i -e 's#xfce4-appfinder#gparted#g' /etc/xdg/xfce4/panel/default.xml echo "Replacing directory menu launcher with setup ..." sed -i -e 's#directorymenu#archboot#g' /etc/xdg/xfce4/panel/default.xml - # use firefox on riscv64 - if [[ "${_RUNNING_ARCH}" == "riscv64" ]]; then - echo "Setting chromium as default browser ..." - sed -i -e 's#firefox#chromium#g' /etc/xdg/xfce4/helpers.rc - fi + echo "Setting ${_STANDARD_BROWSER} as default browser ..." + sed -i -e "s#firefox#${_STANDARD_BROWSER}#g" /etc/xdg/xfce4/helpers.rc echo "Replacing menu structure ..." cat << EOF >/etc/xdg/menus/xfce-applications.menu