manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Using internal prefix for PACKAGES variable in function/packages.sh (Closes: #468900).

This commit is contained in:
Daniel Baumann 2008-08-25 12:01:37 +02:00
parent ad34e84ca7
commit d0bd7bc265
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
functions/packages.sh
View File

@ -18,7 +18,7 @@ Check_package ()
case "${INSTALL_STATUS}" in
1)
PACKAGES="${PACKAGES} ${PACKAGE}"
_LH_PACKAGES="${_LH_PACKAGES} ${PACKAGE}"
;;
2)
@ -30,15 +30,15 @@ Check_package ()
Install_package ()
{
if [ -n "${PACKAGES}" ] && [ "${LH_CHROOT_BUILD}" != "disabled" ]
if [ -n "${_LH_PACKAGES}" ] && [ "${LH_CHROOT_BUILD}" != "disabled" ]
then
case "${LH_APT}" in
apt|apt-get)
Chroot "apt-get install -o APT::Install-Recommends=false --yes ${PACKAGES}"
Chroot "apt-get install -o APT::Install-Recommends=false --yes ${_LH_PACKAGES}"
;;
aptitude)
Chroot "aptitude install --without-recommends --assume-yes ${PACKAGES}"
Chroot "aptitude install --without-recommends --assume-yes ${_LH_PACKAGES}"
;;
esac
fi
@ -46,15 +46,15 @@ Install_package ()
Remove_package ()
{
if [ -n "${PACKAGES}" ] && [ "${LH_CHROOT_BUILD}" != "disabled" ]
if [ -n "${_LH_PACKAGES}" ] && [ "${LH_CHROOT_BUILD}" != "disabled" ]
then
case "${LH_APT}" in
apt|apt-get)
Chroot "apt-get remove --purge --yes ${PACKAGES}"
Chroot "apt-get remove --purge --yes ${_LH_PACKAGES}"
;;
aptitude)
Chroot "aptitude purge --assume-yes ${PACKAGES}"
Chroot "aptitude purge --assume-yes ${_LH_PACKAGES}"
;;
esac
fi