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

better messages

Browse source
This commit is contained in:
Tobias Powalowski 2023-08-04 10:50:50 +02:00
parent e320f782d5
commit 92f6756881
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -74,7 +74,10 @@ if [[ -n "${_L_XFCE}" || -n "${_L_SWAY}" || -n "${_L_PLASMA}" || -n "${_L_GNOME}
touch /.update
_TITLE="Archboot $(uname -m) | Basic Setup | Desktop Environment"
[[ -e /var/cache/pacman/pkg/archboot.db ]] && touch /.graphic_installed
[[ -n "${_L_XFCE}" ]] && _install_xfce | _dialog --title "${_MENU_TITLE}" --gauge "Initializing Xfce..." 6 75 0
if [[ -n "${_L_XFCE}" ]]; then
_ENVIRONMENT="Xfce"
_install_xfce | _dialog --title "${_MENU_TITLE}" --gauge "Initializing Xfce..." 6 75 0
fi
[[ -n "${_L_GNOME}" ]] && _install_gnome
[[ -n "${_L_GNOME_WAYLAND}" ]] && _install_gnome_wayland
[[ -n "${_L_PLASMA}" ]] && _install_plasma

10
usr/lib/archboot/update/desktop.sh
View file

@ -63,14 +63,14 @@ _install_graphic() {
_prepare_graphic() {
_GRAPHIC="${1}"
if [[ ! -e "/.full_system" ]]; then
_progress "2" "Removing firmware files..."
_progress "1" "Removing firmware files..."
rm -rf /usr/lib/firmware
# fix libs first, then install packages from defaults
_GRAPHIC="${1}"
fi
touch /.archboot
_update_packages &
_progress_wait "3" "10" "Updating environment to latest packages..." "5"
_progress_wait "2" "10" "Updating environment to latest packages..." "5"
# check for qxl module
if grep -q qxl /proc/modules; then
echo "${_GRAPHIC}" | grep -q xorg && _GRAPHIC="${_GRAPHIC} xf86-video-qxl"
@ -78,7 +78,7 @@ _prepare_graphic() {
_COUNT=11
for i in ${_FIX_PACKAGES}; do
#shellcheck disable=SC2086
_progress "${_COUNT}" "Installing package ${i}..."
_progress "${_COUNT}" "Installing basic packages ${i}..."
pacman -S ${i} --noconfirm &>"${_LOG}"
[[ ! -e "/.full_system" ]] && _cleanup_install
[[ "$(grep -w MemTotal /proc/meminfo | cut -d ':' -f2 | sed -e 's# ##g' -e 's#kB$##g')" -lt 4413000 ]] && _cleanup_cache
@ -87,7 +87,7 @@ _prepare_graphic() {
done
touch /.archboot
_install_graphic &
_progress_wait "${_COUNT}" "89" "Installing Desktop Environment..." "1"
_progress_wait "${_COUNT}" "98" "Installing ${_ENVIRONMENT}..." "1"
if [[ ! -e "/.full_system" ]]; then
echo "Removing not used icons..." >"${_LOG}"
rm -rf /usr/share/icons/breeze-dark
@ -100,7 +100,7 @@ _prepare_graphic() {
! -path '*/sv/*' ! -path '*/uk/*' -delete &>"${_NO_LOG}"
find /usr/share/i18n/charmaps ! -name 'UTF-8.gz' -delete &>"${_NO_LOG}"
fi
_progress "90" "Restart dbus..."
_progress "99" "Restart dbus..."
systemd-sysusers >"${_LOG}" 2>&1
systemd-tmpfiles --create >"${_LOG}" 2>&1
# fixing dbus requirements