root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-20 12:00:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

move gnome install to gnome_prepare

Browse source
This commit is contained in:
Tobias Powalowski 2022-10-04 09:49:55 +02:00
parent 0fbf4a33a3
commit 8208b49908
3 changed files with 18 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
usr/lib/archboot/common.sh
View file

@ -169,6 +169,20 @@ _cachedir_check() {
fi fi
} }
_prepare_gnome() {
if ! [[ -e /usr/bin/gnome-session ]]; then
echo -e "\033[1mStep 3/5:\033[0m Installing GNOME desktop now ..."
echo " This will need some time ..."
_prepare_graphic "${_PACKAGES}"
echo -e "\033[1mStep 4/5:\033[0m Configuring GNOME desktop ..."
_configure_gnome
systemd-sysusers
systemd-tmpfiles --create
else
echo -e "\033[1mStep 3/5:\033[0m Installing GNOME desktop already done ..."
echo -e "\033[1mStep 4/5:\033[0m Configuring GNOME desktop already done ..."
fi
}
_configure_gnome() { _configure_gnome() {
echo "Configuring Gnome ..." echo "Configuring Gnome ..."

15
usr/lib/archboot/gnome-wayland.sh
View file

@ -2,21 +2,10 @@
# created by Tobias Powalowski <tpowa@archlinux.org> # created by Tobias Powalowski <tpowa@archlinux.org>
_install_gnome_wayland() { _install_gnome_wayland() {
if ! [[ -e /usr/bin/gnome-session ]]; then _PACKAGES="${_WAYLAND_PACKAGE} ${_STANDARD_PACKAGES} ${_STANDARD_BROWSER} ${_GNOME_PACKAGES}"
echo -e "\033[1mStep 3/5:\033[0m Installing GNOME Wayland now ..." _prepare_gnome >/dev/tty7 2>&1
echo " This will need some time ..."
_prepare_graphic "${_WAYLAND_PACKAGE} ${_STANDARD_PACKAGES} ${_STANDARD_BROWSER} ${_GNOME_PACKAGES}" >/dev/tty7 2>&1
echo -e "\033[1mStep 4/5:\033[0m Configuring GNOME Wayland ..."
_configure_gnome >/dev/tty7 2>&1
systemd-sysusers >/dev/tty7 2>&1
systemd-tmpfiles --create >/dev/tty7 2>&1
else
echo -e "\033[1mStep 3/5:\033[0m Installing GNOME Wayland already done ..."
echo -e "\033[1mStep 4/5:\033[0m Configuring GNOME Wayland already done ..."
fi
} }
_start_gnome_wayland() { _start_gnome_wayland() {
echo -e "Launching GNOME Wayland now, logging is done on \033[1m/dev/tty7\033[0m ..." echo -e "Launching GNOME Wayland now, logging is done on \033[1m/dev/tty7\033[0m ..."
echo -e "To relaunch GNOME Wayland use: \033[92mgnome-wayland\033[0m" echo -e "To relaunch GNOME Wayland use: \033[92mgnome-wayland\033[0m"

14
usr/lib/archboot/gnome.sh
View file

@ -2,18 +2,8 @@
# created by Tobias Powalowski <tpowa@archlinux.org> # created by Tobias Powalowski <tpowa@archlinux.org>
_install_gnome() { _install_gnome() {
if ! [[ -e /usr/bin/gnome-session ]]; then _PACKAGES="${_XORG_PACKAGE} ${_VNC_PACKAGE} ${_STANDARD_PACKAGES} ${_STANDARD_BROWSER} ${_GNOME_PACKAGES}"
echo -e "\033[1mStep 3/5:\033[0m Installing GNOME desktop now ..." _prepare_gnome >/dev/tty7 2>&1
echo " This will need some time ..."
_prepare_graphic "${_XORG_PACKAGE} ${_VNC_PACKAGE} ${_STANDARD_PACKAGES} ${_STANDARD_BROWSER} ${_GNOME_PACKAGES}" >/dev/tty7 2>&1
echo -e "\033[1mStep 4/5:\033[0m Configuring GNOME desktop ..."
_configure_gnome >/dev/tty7 2>&1
systemd-sysusers >/dev/tty7 2>&1
systemd-tmpfiles --create >/dev/tty7 2>&1
else
echo -e "\033[1mStep 3/5:\033[0m Installing GNOME desktop already done ..."
echo -e "\033[1mStep 4/5:\033[0m Configuring GNOME desktop already done ..."
fi
} }
_start_gnome() { _start_gnome() {