From f73797158e631d9fa2d4c9994e2feff542a7501b Mon Sep 17 00:00:00 2001 From: Lyndon Brown Date: Sat, 28 Mar 2020 02:21:36 +0000 Subject: bootloaders: improve bootloader list handling two parts of the code worked with both comma and space separated lists, while two others only worked with comma separated. swapping out commas with spaces when we setup the var in Set_config_defaults() means that individual scripts no longer need to worry about it and everything supports both; and that we can avoid the IFS/OLDIFS mess. Gbp-Dch: Short --- scripts/build/binary_hdd | 2 +- scripts/build/binary_iso | 3 --- scripts/build/source_debian | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) (limited to 'scripts') diff --git a/scripts/build/binary_hdd b/scripts/build/binary_hdd index b81c301da..437913929 100755 --- a/scripts/build/binary_hdd +++ b/scripts/build/binary_hdd @@ -53,7 +53,7 @@ Check_package chroot /sbin/parted parted Check_package host /sbin/fdisk fdisk Check_package host /sbin/losetup mount -for BOOTLOADER in $(echo "${LB_BOOTLOADERS}" | tr "," "\n"); do +for BOOTLOADER in ${LB_BOOTLOADERS}; do case "${BOOTLOADER}" in grub-legacy) Check_package chroot /usr/sbin/grub grub diff --git a/scripts/build/binary_iso b/scripts/build/binary_iso index eef752f80..9f1b11a86 100755 --- a/scripts/build/binary_iso +++ b/scripts/build/binary_iso @@ -104,8 +104,6 @@ fi # Set an explicit modification date XORRISO_OPTIONS="${XORRISO_OPTIONS} --modification-date=$(date --utc --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y%m%d%H%m%S00)" -OLDIFS="$IFS" -IFS="," BOOTLOADER_NUMBER=0 for BOOTLOADER in ${LB_BOOTLOADERS} do @@ -156,7 +154,6 @@ do esac done -IFS="$OLDIFS" #if [ "${LB_DEBIAN_INSTALLER}" != "live" ] #then diff --git a/scripts/build/source_debian b/scripts/build/source_debian index b9899b2bc..5e37edbca 100755 --- a/scripts/build/source_debian +++ b/scripts/build/source_debian @@ -54,7 +54,7 @@ Chroot chroot "sh source-selection.sh" rm -f chroot/source-selection.sh mv chroot/source-selection.txt ./ -for BOOTLOADER in $(echo "${LB_BOOTLOADERS}" | tr "," "\n"); do +for BOOTLOADER in ${LB_BOOTLOADERS}; do echo "${BOOTLOADER}" >> source-selection.txt done -- cgit v1.2.3