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

Migrate a few uses of grep to In_list. 

Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
This commit is contained in:
Chris Lamb 2008-06-20 01:31:21 +01:00
parent 912c054a7e
commit c05c115684
9 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
helpers/lh_binary_iso
View File

@ -28,7 +28,7 @@ Arguments "${@}"
Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
if ! echo "${LH_BINARY_IMAGES}" | grep -qs iso
if ! In_list iso "${LH_BINARY_IMAGES}"
then
exit 0
fi
@ -124,13 +124,12 @@ case "${LH_BOOTLOADER}" in
;;
esac
if [ "${LH_DEBIAN_INSTALLER}" != "live" ]
if In_list "stripped minimal" "${LH_PACKAGES_LISTS}"
then
case "${LH_PACKAGES_LISTS}" in
stripped|minimal)
GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -m ${GENISOIMAGE_EXCLUDE}"
;;
esac
if [ "${LH_DEBIAN_INSTALLER}" != "live" ]
then
GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -m ${GENISOIMAGE_EXCLUDE}"
fi
fi
cat > binary.sh << EOF

2
helpers/lh_binary_net
View File

@ -28,7 +28,7 @@ Arguments "${@}"
Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
if ! echo "${LH_BINARY_IMAGES}" | grep -qs net
if ! In_list net "${LH_BINARY_IMAGES}"
then
exit 0
fi

2
helpers/lh_binary_tar
View File

@ -28,7 +28,7 @@ Arguments "${@}"
Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
if ! echo "${LH_BINARY_IMAGES}" | grep -qs tar
if ! In_list tar "${LH_BINARY_IMAGES}"
then
exit 0
fi

2
helpers/lh_binary_usb-hdd
View File

@ -28,7 +28,7 @@ Arguments "${@}"
Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
if ! echo "${LH_BINARY_IMAGES}" | grep -qs usb-hdd
if ! In_list usb-hdd "${LH_BINARY_IMAGES}"
then
exit 0
fi

9
helpers/lh_bootstrap_debootstrap
View File

@ -86,11 +86,10 @@ if [ "${LH_USE_FAKEROOT}" != "enabled" ]
then
if [ -z "${LH_BOOTSTRAP_FLAVOUR}" ]
then
case "${LH_PACKAGES_LISTS}" in
stripped|minimal)
DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --variant=minbase"
;;
esac
if In_list "stripped minimal" "${LH_PACKAGES_LISTS}"
then
DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --variant=minbase"
fi
else
case "${LH_BOOTSTRAP_FLAVOUR}" in
stripped|minimal)

2
helpers/lh_source_iso
View File

@ -33,7 +33,7 @@ then
exit 0
fi
if ! echo "${LH_SOURCE_IMAGES}" | grep -qs iso
if ! In_list iso "${LH_SOURCE_IMAGES}"
then
exit 0
fi

2
helpers/lh_source_net
View File

@ -33,7 +33,7 @@ then
exit 0
fi
if ! echo "${LH_SOURCE_IMAGES}" | grep -qs net
if ! In_list net "${LH_SOURCE_IMAGES}"
then
exit 0
fi

2
helpers/lh_source_tar
View File

@ -33,7 +33,7 @@ then
exit 0
fi
if ! echo "${LH_SOURCE_IMAGES}" | grep -qs tar
if ! In_list tar "${LH_SOURCE_IMAGES}"
then
exit 0
fi

2
helpers/lh_source_usb-hdd
View File

@ -33,7 +33,7 @@ then
exit 0
fi
if ! echo "${LH_SOURCE_IMAGES}" | grep -qs usb-hdd
if ! In_list usb-hdd "${LH_SOURCE_IMAGES}"
then
exit 0
fi