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

code cleanup

Browse source
This commit is contained in:
Tobias Powalowski 2022-10-01 17:20:54 +02:00
parent 4439a0c4ce
commit ce90ea3270
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
usr/lib/archboot/container.sh
View file

@ -153,7 +153,7 @@ _pacman_parameters() {
_PACMAN_CACHEDIR="--cachedir ${_CACHEDIR}" _PACMAN_CACHEDIR="--cachedir ${_CACHEDIR}"
fi fi
# defaults used on every pacman call # defaults used on every pacman call
_PACMAN_DEFAULTS="--config ${_PACMAN_CONF} --ignore systemd-resolvconf --noconfirm" _PACMAN_DEFAULTS="--config ${_PACMAN_CONF} --ignore systemd-resolvconf --noconfirm ${_CACHEDIR}"
} }
_install_base_packages() { _install_base_packages() {
@ -193,18 +193,18 @@ _install_archboot() {
if grep -qw archboot /etc/hostname; then if grep -qw archboot /etc/hostname; then
if [[ "$(grep -w MemTotal /proc/meminfo | cut -d ':' -f2 | sed -e 's# ##g' -e 's#kB$##g')" -gt 3860000 ]]; then if [[ "$(grep -w MemTotal /proc/meminfo | cut -d ':' -f2 | sed -e 's# ##g' -e 's#kB$##g')" -gt 3860000 ]]; then
echo "Downloading ${_ARCHBOOT} ${_GRAPHICAL_PACKAGES} to ${1} ..." echo "Downloading ${_ARCHBOOT} ${_GRAPHICAL_PACKAGES} to ${1} ..."
${_PACMAN} -Syw ${_PACMAN_OPTIONS} ${_GRAPHICAL_PACKAGES} ${_PACMAN_DB} ${_PACMAN_CACHEDIR} >/dev/null 2>&1 || exit 1 ${_PACMAN} -Syw ${_PACMAN_OPTIONS} ${_GRAPHICAL_PACKAGES} ${_PACMAN_DB} >/dev/null 2>&1 || exit 1
else else
echo "Downloading ${_ARCHBOOT} to ${1} ..." echo "Downloading ${_ARCHBOOT} to ${1} ..."
${_PACMAN} -Syw ${_PACMAN_OPTIONS} ${_PACMAN_DB} ${_PACMAN_CACHEDIR} >/dev/null 2>&1 || exit 1 ${_PACMAN} -Syw ${_PACMAN_OPTIONS} ${_PACMAN_DB} >/dev/null 2>&1 || exit 1
fi fi
else else
echo "Downloading ${_ARCHBOOT} ${_GRAPHICAL_PACKAGES} to ${1} ..." echo "Downloading ${_ARCHBOOT} ${_GRAPHICAL_PACKAGES} to ${1} ..."
${_PACMAN} -Syw ${_PACMAN_OPTIONS} ${_GRAPHICAL_PACKAGES} ${_PACMAN_DB} ${_PACMAN_CACHEDIR} >/dev/null 2>&1 || exit 1 ${_PACMAN} -Syw ${_PACMAN_OPTIONS} ${_GRAPHICAL_PACKAGES} ${_PACMAN_DB} >/dev/null 2>&1 || exit 1
fi fi
echo "Installing ${_ARCHBOOT} to ${1} ..." echo "Installing ${_ARCHBOOT} to ${1} ..."
#shellcheck disable=SC2086 #shellcheck disable=SC2086
${_PACMAN} -Sy ${_PACMAN_OPTIONS} ${_PACMAN_CACHEDIR} >/dev/null 2>&1 ${_PACMAN} -Sy ${_PACMAN_OPTIONS} >/dev/null 2>&1
# cleanup # cleanup
if [[ -z "${2}" ]]; then if [[ -z "${2}" ]]; then
rm -r "${1}"/blankdb rm -r "${1}"/blankdb