diff options
| author | Daniel Baumann <daniel@debian.org> | 2008-08-25 12:01:37 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:03:40 +0100 |
| commit | d0bd7bc265748628355fdff835ffcb830e61551e (patch) | |
| tree | df27dda792e5a399be210d279c5441ca77dd978d /functions | |
| parent | ad34e84ca7ba861fb17138c975c02890b6bff07c (diff) | |
| download | live-build-d0bd7bc265748628355fdff835ffcb830e61551e.zip live-build-d0bd7bc265748628355fdff835ffcb830e61551e.tar.gz | |
Using internal prefix for PACKAGES variable in function/packages.sh (Closes: #468900).
Diffstat (limited to 'functions')
| -rwxr-xr-x | functions/packages.sh | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/functions/packages.sh b/functions/packages.sh index 034f571..ed1bdc4 100755 --- a/functions/packages.sh +++ b/functions/packages.sh @@ -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 |