summaryrefslogtreecommitdiff
path: root/functions/packages.sh
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2010-09-07 15:11:20 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:17:21 +0100
commit83bc63f725263c571094e3af1c88c58992bf0ac6 (patch)
tree25be3b96127e122c9f1448f6155dea6b03293248 /functions/packages.sh
parent293765885126c0fe429718f403be2802a225cd68 (diff)
downloadvyos-live-build-83bc63f725263c571094e3af1c88c58992bf0ac6.tar.gz
vyos-live-build-83bc63f725263c571094e3af1c88c58992bf0ac6.zip
Updating internal variables from lh to lb scheme, should be the last piece to finish the live-helper to live-build rename.
Diffstat (limited to 'functions/packages.sh')
-rwxr-xr-xfunctions/packages.sh20
1 files changed, 10 insertions, 10 deletions
diff --git a/functions/packages.sh b/functions/packages.sh
index 8d7953230..20d53df61 100755
--- a/functions/packages.sh
+++ b/functions/packages.sh
@@ -17,7 +17,7 @@ Check_package ()
case "${INSTALL_STATUS}" in
1)
- _LH_PACKAGES="${_LH_PACKAGES} ${PACKAGE}"
+ _LB_PACKAGES="${_LB_PACKAGES} ${PACKAGE}"
;;
2)
@@ -29,15 +29,15 @@ Check_package ()
Install_package ()
{
- if [ -n "${_LH_PACKAGES}" ] && [ "${LH_BUILD_WITH_CHROOT}" != "false" ]
+ if [ -n "${_LB_PACKAGES}" ] && [ "${LB_BUILD_WITH_CHROOT}" != "false" ]
then
- case "${LH_APT}" in
+ case "${LB_APT}" in
apt|apt-get)
- Chroot chroot "apt-get install -o APT::Install-Recommends=false ${APT_OPTIONS} ${_LH_PACKAGES}"
+ Chroot chroot "apt-get install -o APT::Install-Recommends=false ${APT_OPTIONS} ${_LB_PACKAGES}"
;;
aptitude)
- Chroot chroot "aptitude install --without-recommends ${APTITUDE_OPTIONS} ${_LH_PACKAGES}"
+ Chroot chroot "aptitude install --without-recommends ${APTITUDE_OPTIONS} ${_LB_PACKAGES}"
;;
esac
fi
@@ -45,15 +45,15 @@ Install_package ()
Remove_package ()
{
- if [ -n "${_LH_PACKAGES}" ] && [ "${LH_BUILD_WITH_CHROOT}" != "false" ]
+ if [ -n "${_LB_PACKAGES}" ] && [ "${LB_BUILD_WITH_CHROOT}" != "false" ]
then
- case "${LH_APT}" in
+ case "${LB_APT}" in
apt|apt-get)
- Chroot chroot "apt-get remove --purge ${APT_OPTIONS} ${_LH_PACKAGES}"
+ Chroot chroot "apt-get remove --purge ${APT_OPTIONS} ${_LB_PACKAGES}"
;;
aptitude)
- Chroot chroot "aptitude purge ${APTITUDE_OPTIONS} ${_LH_PACKAGES}"
+ Chroot chroot "aptitude purge ${APTITUDE_OPTIONS} ${_LB_PACKAGES}"
;;
esac
fi
@@ -69,7 +69,7 @@ Check_installed ()
FILE="${1}"
PACKAGE="${2}"
- case "${LH_BUILD_WITH_CHROOT}" in
+ case "${LB_BUILD_WITH_CHROOT}" in
true)
if Chroot chroot "dpkg-query -s ${PACKAGE}" 2> /dev/null | grep -qs "Status: install"
then