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

simplify and add it to other DEs too

Browse source
This commit is contained in:
Tobias Powalowski 2023-08-04 12:19:20 +02:00
parent cd7605f9ba
commit b80bc55052
1 changed files with 52 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
usr/bin/archboot-update.sh
View file

@ -68,9 +68,6 @@ if [[ -n "${_CUSTOM_X}" || -n "${_CUSTOM_WAYLAND}" ]]; then
fi fi
# Gnome, KDE/PLASMA or XFCE launch # Gnome, KDE/PLASMA or XFCE launch
if [[ -n "${_L_XFCE}" || -n "${_L_SWAY}" || -n "${_L_PLASMA}" || -n "${_L_GNOME}" || -n "${_L_GNOME_WAYLAND}" || -n "${_L_PLASMA_WAYLAND}" ]]; then if [[ -n "${_L_XFCE}" || -n "${_L_SWAY}" || -n "${_L_PLASMA}" || -n "${_L_GNOME}" || -n "${_L_GNOME_WAYLAND}" || -n "${_L_PLASMA_WAYLAND}" ]]; then
if [[ -e "/.graphic_installed" && "$(grep -w MemTotal /proc/meminfo | cut -d ':' -f2 | sed -e 's# ##g' -e 's#kB$##g')" -lt 4413000 ]]; then
_hint_graphic_installed
else
touch /.update touch /.update
_TITLE="Archboot $(uname -m) | Basic Setup | Desktop Environment" _TITLE="Archboot $(uname -m) | Basic Setup | Desktop Environment"
[[ -e /var/cache/pacman/pkg/archboot.db ]] && touch /.graphic_installed [[ -e /var/cache/pacman/pkg/archboot.db ]] && touch /.graphic_installed
@ -93,6 +90,7 @@ if [[ -n "${_L_XFCE}" || -n "${_L_SWAY}" || -n "${_L_PLASMA}" || -n "${_L_GNOME}
_ENVIRONMENT="Sway" _ENVIRONMENT="Sway"
_install_sway | _dialog --title "${_MENU_TITLE}" --gauge "Initializing ${_ENVIRONMENT}..." 6 75 0 _install_sway | _dialog --title "${_MENU_TITLE}" --gauge "Initializing ${_ENVIRONMENT}..." 6 75 0
fi fi
rm /.update
# only start vnc on xorg environment # only start vnc on xorg environment
echo "Setting up VNC and browser..." >"${_LOG}" echo "Setting up VNC and browser..." >"${_LOG}"
[[ -n "${_L_XFCE}" || -n "${_L_PLASMA}" || -n "${_L_GNOME}" ]] && _autostart_vnc [[ -n "${_L_XFCE}" || -n "${_L_PLASMA}" || -n "${_L_GNOME}" ]] && _autostart_vnc
@ -123,8 +121,6 @@ if [[ -n "${_L_XFCE}" || -n "${_L_SWAY}" || -n "${_L_PLASMA}" || -n "${_L_GNOME}
clear clear
echo -e "To relaunch \e[1mSway\e[m use: \e[92msway-wayland\e[m" echo -e "To relaunch \e[1mSway\e[m use: \e[92msway-wayland\e[m"
fi fi
rm /.update
fi
fi fi
# Switch to full Arch Linux system # Switch to full Arch Linux system
if [[ -n "${_FULL_SYSTEM}" ]]; then if [[ -n "${_FULL_SYSTEM}" ]]; then