diff options
| author | Lyndon Brown <jnqnfe@gmail.com> | 2020-04-01 10:58:47 +0100 |
|---|---|---|
| committer | Raphaël Hertzog <hertzog@debian.org> | 2020-04-23 15:54:19 +0200 |
| commit | 6cc72509541404dc0af57bf2b29dfaaa1ee3e1a4 (patch) | |
| tree | c91a79037457e7bb2c0630fa8c065bee6c465bad /scripts/build/binary_disk | |
| parent | 6def2c27be28169cf3e0757a6928e3f13de157a8 (diff) | |
| download | vyos-live-build-6cc72509541404dc0af57bf2b29dfaaa1ee3e1a4.tar.gz vyos-live-build-6cc72509541404dc0af57bf2b29dfaaa1ee3e1a4.zip | |
rename LB_ARCHITECTURES to LB_ARCHITECTURE
this was previously not done in 8b109ffb96282a6dd1aa5d61aa935bcba69c56f1
to keep the renaming simple, but leaving the variable plural is a cause
for confusion.
since this property is stored in the INI style config/build config file
rather than a shell script based one, at the property there is already
singular, there was no need for a backwards compatibility hack.
Gbp-Dch: Short
Diffstat (limited to 'scripts/build/binary_disk')
| -rwxr-xr-x | scripts/build/binary_disk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/build/binary_disk b/scripts/build/binary_disk index 0e56eb8ef..ca89ba599 100755 --- a/scripts/build/binary_disk +++ b/scripts/build/binary_disk @@ -38,7 +38,7 @@ Acquire_lockfile mkdir -p binary/.disk -ARCHITECTURE="$(echo ${LB_ARCHITECTURES} | sed -e 's| |/|g')" +ARCHITECTURE="$(echo ${LB_ARCHITECTURE} | sed -e 's| |/|g')" DISTRIBUTION="$(echo ${LB_DISTRIBUTION_BINARY} | cut -b 1 | tr '[a-z]' '[A-Z]')" DISTRIBUTION="${DISTRIBUTION}$(echo ${LB_DISTRIBUTION_BINARY} | cut -b 2-)" @@ -135,13 +135,13 @@ do then case "${LB_DEBIAN_INSTALLER}" in cdrom) - cp "${LOCATION}/${LB_PARENT_DISTRIBUTION_BINARY}/${LB_ARCHITECTURES}_udeb_include" binary/.disk/udeb_include + cp "${LOCATION}/${LB_PARENT_DISTRIBUTION_BINARY}/${LB_ARCHITECTURE}_udeb_include" binary/.disk/udeb_include ;; netinst|live) - cp "${LOCATION}/${LB_PARENT_DISTRIBUTION_BINARY}/${LB_ARCHITECTURES}_netinst_udeb_include" binary/.disk/udeb_include + cp "${LOCATION}/${LB_PARENT_DISTRIBUTION_BINARY}/${LB_ARCHITECTURE}_netinst_udeb_include" binary/.disk/udeb_include ;; businesscard) - cp "${LOCATION}/${LB_PARENT_DISTRIBUTION_BINARY}/${LB_ARCHITECTURES}_businesscard_udeb_include" binary/.disk/udeb_include + cp "${LOCATION}/${LB_PARENT_DISTRIBUTION_BINARY}/${LB_ARCHITECTURE}_businesscard_udeb_include" binary/.disk/udeb_include ;; none|netboot) ;; |