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

fix local -full-system

Browse source
This commit is contained in:
Tobias Powalowski 2022-10-08 21:37:00 +02:00
parent c4f13a5ae4
commit 9b9d2d47e6
2 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
usr/lib/archboot/update-installer.sh
View file

@ -345,7 +345,6 @@ _prepare_graphic() {
#shellcheck disable=SC2086 #shellcheck disable=SC2086
pacman -Sy --config ${_PACMAN_CONF} >/dev/null 2>&1 || exit 1 pacman -Sy --config ${_PACMAN_CONF} >/dev/null 2>&1 || exit 1
# check if already full system is used # check if already full system is used
if [[ ! -e "/.full-system" ]]; then
for i in ${_GRAPHIC}; do for i in ${_GRAPHIC}; do
#shellcheck disable=SC2086 #shellcheck disable=SC2086
pacman -S ${i} --config ${_PACMAN_CONF} --noconfirm >/dev/null 2>&1 || exit 1 pacman -S ${i} --config ${_PACMAN_CONF} --noconfirm >/dev/null 2>&1 || exit 1
@ -353,7 +352,6 @@ _prepare_graphic() {
[[ "$(grep -w MemTotal /proc/meminfo | cut -d ':' -f2 | sed -e 's# ##g' -e 's#kB$##g')" -lt 4413000 ]] && _cleanup_cache [[ "$(grep -w MemTotal /proc/meminfo | cut -d ':' -f2 | sed -e 's# ##g' -e 's#kB$##g')" -lt 4413000 ]] && _cleanup_cache
rm -f /var/log/pacman.log rm -f /var/log/pacman.log
done done
fi
else else
echo "Updating environment to latest packages (ignoring packages: ${_GRAPHIC_IGNORE}) ..." echo "Updating environment to latest packages (ignoring packages: ${_GRAPHIC_IGNORE}) ..."
_IGNORE="" _IGNORE=""

2
usr/lib/archboot/xfce.sh
View file

@ -6,7 +6,7 @@ _install_xfce() {
echo -e "\033[1mStep 1/3:\033[0m Installing XFCE desktop now ..." echo -e "\033[1mStep 1/3:\033[0m Installing XFCE desktop now ..."
echo " This will need some time ..." echo " This will need some time ..."
_prepare_graphic "${_XORG_PACKAGE} ${_VNC_PACKAGE} ${_STANDARD_PACKAGES} ${_STANDARD_BROWSER} ${_XFCE_PACKAGES}" >/dev/tty7 2>&1 _prepare_graphic "${_XORG_PACKAGE} ${_VNC_PACKAGE} ${_STANDARD_PACKAGES} ${_STANDARD_BROWSER} ${_XFCE_PACKAGES}" >/dev/tty7 2>&1
echo -e "\033[1mStep 2/35:\033[0m Configuring XFCE desktop ..." echo -e "\033[1mStep 2/3:\033[0m Configuring XFCE desktop ..."
_configure_xfce >/dev/tty7 2>&1 _configure_xfce >/dev/tty7 2>&1
else else
echo -e "\033[1mStep 1/3:\033[0m Installing XFCE desktop already done ..." echo -e "\033[1mStep 1/3:\033[0m Installing XFCE desktop already done ..."