diff options
| author | Lyndon Brown <jnqnfe@gmail.com> | 2020-04-01 10:04:19 +0100 |
|---|---|---|
| committer | Raphaël Hertzog <hertzog@debian.org> | 2020-04-23 09:38:01 +0000 |
| commit | 8c0e802d139a6c4e79566e019d3ebe38b8a4a6f5 (patch) | |
| tree | 5ec3c62e0b7c3a970bff024073c75c9fa0bd4533 | |
| parent | 11836c0c18b07f4bd1ea22a2163875975f3e6816 (diff) | |
| download | vyos-live-build-8c0e802d139a6c4e79566e019d3ebe38b8a4a6f5.tar.gz vyos-live-build-8c0e802d139a6c4e79566e019d3ebe38b8a4a6f5.zip | |
remove some unwanted quoting of list parameters
there are additional instances in binary_* scripts that are left here
because they are covered by changes in MR #157
Gbp-Dch: Short
| -rwxr-xr-x | scripts/build/chroot_firmware | 2 | ||||
| -rwxr-xr-x | scripts/build/installer_debian-installer | 4 | ||||
| -rwxr-xr-x | scripts/build/source_hdd | 3 | ||||
| -rwxr-xr-x | scripts/build/source_tar | 3 |
4 files changed, 5 insertions, 7 deletions
diff --git a/scripts/build/chroot_firmware b/scripts/build/chroot_firmware index 11a4f41ae..02bc9f2de 100755 --- a/scripts/build/chroot_firmware +++ b/scripts/build/chroot_firmware @@ -71,7 +71,7 @@ then else for _ARCHIVE_AREA in ${LB_ARCHIVE_AREAS} do - if ! In_list ${_ARCHIVE_AREA} "${LB_PARENT_ARCHIVE_AREAS}" + if ! In_list ${_ARCHIVE_AREA} ${LB_PARENT_ARCHIVE_AREAS} then DERIVATIVE_ARCHIVE_AREAS="${DERIVATIVE_ARCHIVE_AREAS} ${_ARCHIVE_AREA}" fi diff --git a/scripts/build/installer_debian-installer b/scripts/build/installer_debian-installer index d4b9562d5..be596ed27 100755 --- a/scripts/build/installer_debian-installer +++ b/scripts/build/installer_debian-installer @@ -355,7 +355,7 @@ then else for _ARCHIVE_AREA in ${LB_ARCHIVE_AREAS} do - if ! In_list ${_ARCHIVE_AREA} "${LB_PARENT_ARCHIVE_AREAS}" + if ! In_list ${_ARCHIVE_AREA} ${LB_PARENT_ARCHIVE_AREAS} then DERIVATIVE_ARCHIVE_AREAS="${DERIVATIVE_ARCHIVE_AREAS} ${DERIVATIVE_ARCHIVE_AREAS}" fi @@ -541,7 +541,7 @@ EOF done for _UDEB in ${UDEBS} do - if ! In_list "$(basename ${_UDEB} | awk -F_ '{ print $1 }')" "${_UDEBS_DERIVED_NAMES}" + if ! In_list "$(basename ${_UDEB} | awk -F_ '{ print $1 }')" ${_UDEBS_DERIVED_NAMES} then _UDEBS_FILTERED="${_UDEBS_FILTERED} ${_UDEB}" fi diff --git a/scripts/build/source_hdd b/scripts/build/source_hdd index 01609092c..6b10e64d8 100755 --- a/scripts/build/source_hdd +++ b/scripts/build/source_hdd @@ -26,8 +26,7 @@ then exit 0 fi -if ! In_list hdd "${LB_SOURCE_IMAGES}" -then +if ! In_list hdd ${LB_SOURCE_IMAGES}; then exit 0 fi diff --git a/scripts/build/source_tar b/scripts/build/source_tar index 5d7a83a55..4293ace36 100755 --- a/scripts/build/source_tar +++ b/scripts/build/source_tar @@ -26,8 +26,7 @@ then exit 0 fi -if ! In_list tar "${LB_SOURCE_IMAGES}" -then +if ! In_list tar ${LB_SOURCE_IMAGES}; then exit 0 fi |