mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-20 03:50:37 +02:00
install browser first
This commit is contained in:
parent
8e5a771614
commit
5d1a0907a7
1 changed files with 17 additions and 17 deletions
|
@ -68,23 +68,6 @@ if [[ -n "${_L_XFCE}" || -n "${_L_SWAY}" || -n "${_L_PLASMA}" || -n "${_L_GNOME}
|
||||||
: > /.update
|
: > /.update
|
||||||
_TITLE="archboot.com | ${_RUNNING_ARCH} | ${_RUNNING_KERNEL} | Basic Setup | Desktop Environment"
|
_TITLE="archboot.com | ${_RUNNING_ARCH} | ${_RUNNING_KERNEL} | Basic Setup | Desktop Environment"
|
||||||
[[ -e /var/cache/pacman/pkg/archboot.db ]] && : > /.graphic_installed
|
[[ -e /var/cache/pacman/pkg/archboot.db ]] && : > /.graphic_installed
|
||||||
if [[ -n "${_L_XFCE}" ]]; then
|
|
||||||
_ENVIRONMENT="XFCE"
|
|
||||||
_install_xfce | _dialog --title "${_MENU_TITLE}" --gauge "Initializing ${_ENVIRONMENT}..." 6 75 0
|
|
||||||
elif [[ -n "${_L_GNOME}" ]]; then
|
|
||||||
_ENVIRONMENT="GNOME"
|
|
||||||
_install_gnome | _dialog --title "${_MENU_TITLE}" --gauge "Initializing ${_ENVIRONMENT}..." 6 75 0
|
|
||||||
elif [[ -n "${_L_PLASMA}" ]];then
|
|
||||||
_ENVIRONMENT="Plasma/KDE"
|
|
||||||
_install_plasma | _dialog --title "${_MENU_TITLE}" --gauge "Initializing ${_ENVIRONMENT}..." 6 75 0
|
|
||||||
elif [[ -n "${_L_SWAY}" ]]; then
|
|
||||||
_ENVIRONMENT="Sway"
|
|
||||||
_install_sway | _dialog --title "${_MENU_TITLE}" --gauge "Initializing ${_ENVIRONMENT}..." 6 75 0
|
|
||||||
fi
|
|
||||||
rm /.update
|
|
||||||
# only start vnc on xorg environment
|
|
||||||
echo "Setting up VNC and browser..." >"${_LOG}"
|
|
||||||
[[ -n "${_L_XFCE}" ]] && _autostart_vnc
|
|
||||||
if [[ "${_STANDARD_BROWSER}" == "firefox" ]]; then
|
if [[ "${_STANDARD_BROWSER}" == "firefox" ]]; then
|
||||||
pacman -Q chromium &>"${_NO_LOG}" && pacman -R --noconfirm chromium &>"${_LOG}"
|
pacman -Q chromium &>"${_NO_LOG}" && pacman -R --noconfirm chromium &>"${_LOG}"
|
||||||
pacman -Q firefox &>"${_NO_LOG}" || _run_pacman firefox
|
pacman -Q firefox &>"${_NO_LOG}" || _run_pacman firefox
|
||||||
|
@ -112,6 +95,23 @@ if [[ -n "${_L_XFCE}" || -n "${_L_SWAY}" || -n "${_L_PLASMA}" || -n "${_L_GNOME}
|
||||||
pacman -Q chromium &>"${_NO_LOG}" || _run_pacman chromium
|
pacman -Q chromium &>"${_NO_LOG}" || _run_pacman chromium
|
||||||
_chromium_flags
|
_chromium_flags
|
||||||
fi
|
fi
|
||||||
|
if [[ -n "${_L_XFCE}" ]]; then
|
||||||
|
_ENVIRONMENT="XFCE"
|
||||||
|
_install_xfce | _dialog --title "${_MENU_TITLE}" --gauge "Initializing ${_ENVIRONMENT}..." 6 75 0
|
||||||
|
elif [[ -n "${_L_GNOME}" ]]; then
|
||||||
|
_ENVIRONMENT="GNOME"
|
||||||
|
_install_gnome | _dialog --title "${_MENU_TITLE}" --gauge "Initializing ${_ENVIRONMENT}..." 6 75 0
|
||||||
|
elif [[ -n "${_L_PLASMA}" ]];then
|
||||||
|
_ENVIRONMENT="Plasma/KDE"
|
||||||
|
_install_plasma | _dialog --title "${_MENU_TITLE}" --gauge "Initializing ${_ENVIRONMENT}..." 6 75 0
|
||||||
|
elif [[ -n "${_L_SWAY}" ]]; then
|
||||||
|
_ENVIRONMENT="Sway"
|
||||||
|
_install_sway | _dialog --title "${_MENU_TITLE}" --gauge "Initializing ${_ENVIRONMENT}..." 6 75 0
|
||||||
|
fi
|
||||||
|
rm /.update
|
||||||
|
# only start vnc on xorg environment
|
||||||
|
echo "Setting up VNC and browser..." >"${_LOG}"
|
||||||
|
[[ -n "${_L_XFCE}" ]] && _autostart_vnc
|
||||||
echo "Setting ${_STANDARD_BROWSER} as default browser..." >"${_LOG}"
|
echo "Setting ${_STANDARD_BROWSER} as default browser..." >"${_LOG}"
|
||||||
# gnome
|
# gnome
|
||||||
if command -v gsettings &>"${_NO_LOG}"; then
|
if command -v gsettings &>"${_NO_LOG}"; then
|
||||||
|
|
Loading…
Reference in a new issue