mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-19 19:40:37 +02:00
move browser installation
This commit is contained in:
parent
7a2514377d
commit
6b92379676
5 changed files with 5 additions and 2 deletions
|
@ -68,7 +68,6 @@ if [[ -n "${_L_XFCE}" || -n "${_L_SWAY}" || -n "${_L_PLASMA}" || -n "${_L_GNOME}
|
|||
: > /.update
|
||||
_TITLE="archboot.com | ${_RUNNING_ARCH} | ${_RUNNING_KERNEL} | Basic Setup | Desktop Environment"
|
||||
[[ -e /var/cache/pacman/pkg/archboot.db ]] && : > /.graphic_installed
|
||||
_prepare_browser | _dialog --title "${_MENU_TITLE}" --gauge "Installing ${_STANDARD_BROWSER}..." 6 75 0
|
||||
if [[ -n "${_L_XFCE}" ]]; then
|
||||
_ENVIRONMENT="XFCE"
|
||||
_install_xfce | _dialog --title "${_MENU_TITLE}" --gauge "Initializing ${_ENVIRONMENT}..." 6 75 0
|
||||
|
|
|
@ -30,7 +30,8 @@ _prepare_gnome() {
|
|||
if ! [[ -e /usr/bin/gnome-session ]]; then
|
||||
_prepare_graphic "${_PACKAGES}"
|
||||
fi
|
||||
_configure_gnome >"${_LOG}" 2>&1
|
||||
_prepare_browser
|
||||
_configure_gnome >"${_LOG}" 2>&1
|
||||
}
|
||||
|
||||
_install_gnome() {
|
||||
|
|
|
@ -64,6 +64,7 @@ _prepare_plasma() {
|
|||
if ! [[ -e /usr/bin/startplasma-x11 ]]; then
|
||||
_prepare_graphic "${_PACKAGES}"
|
||||
fi
|
||||
_prepare_browser >"${_LOG}" 2>&1
|
||||
_configure_plasma >"${_LOG}" 2>&1
|
||||
}
|
||||
|
||||
|
|
|
@ -105,6 +105,7 @@ _install_sway() {
|
|||
if ! [[ -e /usr/bin/sway ]]; then
|
||||
_prepare_graphic "${_PACKAGES}"
|
||||
fi
|
||||
_prepare_browser >"${_LOG}" 2>&1
|
||||
_configure_sway >"${_LOG}" 2>&1
|
||||
}
|
||||
|
||||
|
|
|
@ -5,6 +5,7 @@ _install_xfce() {
|
|||
if ! [[ -e /usr/bin/startxfce4 ]]; then
|
||||
_prepare_graphic "${_XORG_PACKAGE} ${_VNC_PACKAGE} ${_STANDARD_PACKAGES} ${_XFCE_PACKAGES}"
|
||||
fi
|
||||
_prepare_browser
|
||||
_configure_xfce >"${_LOG}" 2>&1
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue