summaryrefslogtreecommitdiff
path: root/functions/packages.sh
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2009-12-13 21:17:45 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:17:03 +0100
commit701b5affd403d9a25df311fc422dd33eb4526c34 (patch)
tree7e7cc9f57ceb0d3700ee13541944efb044ae9d60 /functions/packages.sh
parent32930b4a6a14374d2895a4e9247fdc192a91124b (diff)
downloadvyos-live-build-701b5affd403d9a25df311fc422dd33eb4526c34.tar.gz
vyos-live-build-701b5affd403d9a25df311fc422dd33eb4526c34.zip
For consistency, using true|false instead of enabled|disabled in configuration options.
Diffstat (limited to 'functions/packages.sh')
-rwxr-xr-xfunctions/packages.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/functions/packages.sh b/functions/packages.sh
index 13c0bf4db..ce5c76afb 100755
--- a/functions/packages.sh
+++ b/functions/packages.sh
@@ -28,7 +28,7 @@ Check_package ()
Install_package ()
{
- if [ -n "${_LH_PACKAGES}" ] && [ "${LH_CHROOT_BUILD}" != "disabled" ]
+ if [ -n "${_LH_PACKAGES}" ] && [ "${LH_CHROOT_BUILD}" != "false" ]
then
case "${LH_APT}" in
apt|apt-get)
@@ -44,7 +44,7 @@ Install_package ()
Remove_package ()
{
- if [ -n "${_LH_PACKAGES}" ] && [ "${LH_CHROOT_BUILD}" != "disabled" ]
+ if [ -n "${_LH_PACKAGES}" ] && [ "${LH_CHROOT_BUILD}" != "false" ]
then
case "${LH_APT}" in
apt|apt-get)
@@ -69,7 +69,7 @@ Check_installed ()
PACKAGE="${2}"
case "${LH_CHROOT_BUILD}" in
- enabled)
+ true)
if Chroot chroot "dpkg-query -s ${PACKAGE}" 2> /dev/null | grep -qs "Status: install"
then
INSTALL_STATUS=0
@@ -77,7 +77,7 @@ Check_installed ()
INSTALL_STATUS=1
fi
;;
- disabled)
+ false)
if which dpkg-query > /dev/null 2>&1
then
if Chroot chroot "dpkg-query -s ${PACKAGE}" 2> /dev/null | grep -qs "Status: install"