Skip to content

Commit e532c96

Browse files
committed
use newlines as delimiter
1 parent d1eb979 commit e532c96

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

bot/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,6 @@ echo "Executing command to create tarball:"
332332
echo "$software_layer_dir/eessi_container.sh ${COMMON_ARGS[@]} ${TARBALL_STEP_ARGS[@]}"
333333
echo " -- $software_layer_dir/create_tarball.sh ${TMP_IN_CONTAINER} ${EESSI_VERSION}${EESSI_SOFTWARE_LAYER_VERSION_SUFFIX} ${EESSI_SOFTWARE_SUBDIR_OVERRIDE} \"${EESSI_ACCELERATOR_TARGET_OVERRIDES[@]}\" /eessi_bot_job/${TARBALL} 2>&1 | tee -a ${tar_outerr}"
334334
$software_layer_dir/eessi_container.sh "${COMMON_ARGS[@]}" "${TARBALL_STEP_ARGS[@]}" \
335-
-- $software_layer_dir/create_tarball.sh ${TMP_IN_CONTAINER} ${EESSI_VERSION}${EESSI_SOFTWARE_LAYER_VERSION_SUFFIX} ${EESSI_SOFTWARE_SUBDIR_OVERRIDE} "${EESSI_ACCELERATOR_TARGET_OVERRIDES[*]}" /eessi_bot_job/${TARBALL} 2>&1 | tee -a ${tar_outerr}
335+
-- $software_layer_dir/create_tarball.sh ${TMP_IN_CONTAINER} ${EESSI_VERSION}${EESSI_SOFTWARE_LAYER_VERSION_SUFFIX} ${EESSI_SOFTWARE_SUBDIR_OVERRIDE} "$(printf '%s\n' \"${EESSI_ACCELERATOR_TARGET_OVERRIDES[@]}\")" /eessi_bot_job/${TARBALL} 2>&1 | tee -a ${tar_outerr}
336336

337337
exit 0

create_tarball.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,8 @@ fi
6666
sw_subdirs=${cpu_arch_subdir}
6767
if [ -n "${accel_subdirs}" ]; then
6868
# convert accel_subdirs into an array...
69-
read -r -a accel_subdirs <<< ${accel_subdirs}
69+
#read -r -a accel_subdirs <<< ${accel_subdirs}
70+
mapfile -t accel_subdirs <<< "$accel_subdirs"
7071
# and prepend the cpu_arch_subdir to all elements
7172
accel_subdirs="${accel_subdirs[@]/#/${cpu_arch_subdir}/}"
7273
sw_subdirs="${sw_subdirs} ${accel_subdirs[@]}"

0 commit comments

Comments
 (0)