From 6cc72509541404dc0af57bf2b29dfaaa1ee3e1a4 Mon Sep 17 00:00:00 2001 From: Lyndon Brown Date: Wed, 1 Apr 2020 10:58:47 +0100 Subject: 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 --- scripts/build/binary_tar | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'scripts/build/binary_tar') diff --git a/scripts/build/binary_tar b/scripts/build/binary_tar index 23bcbf6f0..fba1486ed 100755 --- a/scripts/build/binary_tar +++ b/scripts/build/binary_tar @@ -37,25 +37,25 @@ Check_stagefile Acquire_lockfile # Remove old binary -rm -f ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.tar.bz2 ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.tar.gz ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.tar.lz ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.tar +rm -f ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURE}.tar.bz2 ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURE}.tar.gz ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURE}.tar.lz ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURE}.tar -tar cf ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.tar.tar binary +tar cf ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURE}.tar.tar binary case "${LB_COMPRESSION}" in bzip2) - bzip2 ${BZIP2_OPTIONS} ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.tar.tar + bzip2 ${BZIP2_OPTIONS} ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURE}.tar.tar ;; gzip) - gzip ${GZIP_OPTIONS} ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.tar.tar + gzip ${GZIP_OPTIONS} ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURE}.tar.tar ;; lzip) - lzip ${LZIP_OPTIONS} ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.tar.tar + lzip ${LZIP_OPTIONS} ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURE}.tar.tar ;; xz) - xz ${XZ_OPTIONS} ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.tar.tar + xz ${XZ_OPTIONS} ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURE}.tar.tar ;; none) -- cgit v1.2.3