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

better percentages

Browse source
This commit is contained in:
Tobias Powalowski 2023-08-04 08:21:22 +02:00
parent f790db0530
commit 6a3d284f14
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -24,7 +24,8 @@ _prepare_graphic() {
# fix libs first, then install packages from defaults # fix libs first, then install packages from defaults
_GRAPHIC="${_FIX_PACKAGES} ${1}" _GRAPHIC="${_FIX_PACKAGES} ${1}"
fi fi
_progress 3 "Updating environment to latest packages (ignoring packages: ${_GRAPHIC_IGNORE})..." touch /.archboot
_progress_wait "3" "10" "Updating environment to latest packages..." "5"
_IGNORE="" _IGNORE=""
if [[ -n "${_GRAPHIC_IGNORE}" ]]; then if [[ -n "${_GRAPHIC_IGNORE}" ]]; then
for i in ${_GRAPHIC_IGNORE}; do for i in ${_GRAPHIC_IGNORE}; do
@ -34,12 +35,13 @@ _prepare_graphic() {
#shellcheck disable=SC2086 #shellcheck disable=SC2086
pacman -Syu ${_IGNORE} --noconfirm &>"${_NO_LOG}" || exit 1 pacman -Syu ${_IGNORE} --noconfirm &>"${_NO_LOG}" || exit 1
[[ ! -e "/.full_system" ]] && _cleanup_install [[ ! -e "/.full_system" ]] && _cleanup_install
rm /.archboot
# check for qxl module # check for qxl module
if grep -q qxl /proc/modules; then if grep -q qxl /proc/modules; then
echo ${_GRAPHIC} | grep -q xorg && _GRAPHIC="${_GRAPHIC} xf86-video-qxl" echo ${_GRAPHIC} | grep -q xorg && _GRAPHIC="${_GRAPHIC} xf86-video-qxl"
fi fi
touch /.archboot touch /.archboot
_progress_wait "4" "50" "Running pacman to install packages: ${_GRAPHIC}..." "0.5" _progress_wait "11" "59" "Running pacman to install packages: ${_GRAPHIC}..." "0.5"
for i in ${_GRAPHIC}; do for i in ${_GRAPHIC}; do
#shellcheck disable=SC2086 #shellcheck disable=SC2086
pacman -S ${i} --noconfirm &>"${_NO_LOG}" || exit 1 pacman -S ${i} --noconfirm &>"${_NO_LOG}" || exit 1
@ -49,7 +51,7 @@ _prepare_graphic() {
done done
# install firefox langpacks # install firefox langpacks
if [[ "${_STANDARD_BROWSER}" == "firefox" ]]; then if [[ "${_STANDARD_BROWSER}" == "firefox" ]]; then
_progress "60" "Installing firefox langpack..." _progress_wait "60" "69" "Installing firefox langpack..." "0.5"
_LANG="be bg cs da de el fi fr hu it lt lv mk nl nn pl ro ru sk sr uk" _LANG="be bg cs da de el fi fr hu it lt lv mk nl nn pl ro ru sk sr uk"
for i in ${_LANG}; do for i in ${_LANG}; do
if grep -q "${i}" /etc/locale.conf; then if grep -q "${i}" /etc/locale.conf; then