From de1bfc0254877ef4f28feb976ebc3643db8da4ba Mon Sep 17 00:00:00 2001 From: John Date: Mon, 15 Mar 2021 23:07:44 +0100 Subject: [PATCH] u-boot-menu: use printf instead of echo echo doesn't expand escapesequences in bash, printf is the portable way to achieve this --- srcpkgs/u-boot-menu/files/kernel.d/extlinux | 20 ++++++++++---------- srcpkgs/u-boot-menu/template | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/srcpkgs/u-boot-menu/files/kernel.d/extlinux b/srcpkgs/u-boot-menu/files/kernel.d/extlinux index 2c724b101ff069..5a4465698a468a 100644 --- a/srcpkgs/u-boot-menu/files/kernel.d/extlinux +++ b/srcpkgs/u-boot-menu/files/kernel.d/extlinux @@ -1,9 +1,9 @@ #!/bin/sh header() { - echo "TIMEOUT ${TIMEOUT}" > ${OUTFILE} - echo "DEFAULT entry0" >> ${OUTFILE} - echo "MENU TITLE Boot menu" >> ${OUTFILE} + printf "TIMEOUT %s\n" ${TIMEOUT} > ${OUTFILE} + printf "DEFAULT entry0\n" >> ${OUTFILE} + printf "MENU TITLE Boot menu\n" >> ${OUTFILE} } get_bootpath() { @@ -18,19 +18,19 @@ add_kernel() { fdt=$(get_bootpath "/boot/dtbs/dtbs-${ver}/${DTBPATH}") cmdline="${CMDLINE}" - echo "LABEL entry${ENTRY}" >> ${OUTFILE} - echo "\tMENU LABEL Void Linux Version ${ver}" >> ${OUTFILE} - echo "\tLINUX ${kernel}" >> ${OUTFILE} + printf "LABEL entry%s\n" ${ENTRY} >> ${OUTFILE} + printf "\tMENU LABEL Void Linux Version %s\n" ${ver} >> ${OUTFILE} + printf "\tLINUX %s\n" ${kernel} >> ${OUTFILE} if [ -e "${BOOTPART}/${initrd}" ]; then - echo "\tINITRD ${initrd}" >> ${OUTFILE} + printf "\tINITRD %s\n" ${initrd} >> ${OUTFILE} fi if [ -n "${USE_DEVICETREEDIR}" ]; then - printf "\tDEVICETREEDIR ${devicetreedir}\n" >> ${OUTFILE} + printf "\tDEVICETREEDIR %s\n" ${devicetreedir} >> ${OUTFILE} elif [ -n "${DTBPATH}" ] && [ -e "${BOOTPART}/${fdt}" ]; then - echo "\tFDT ${fdt}" >> ${OUTFILE} + printf "\tFDT %s\n" ${fdt} >> ${OUTFILE} fi if [ -n "${cmdline}" ]; then - echo "\tAPPEND ${cmdline}" >> ${OUTFILE} + printf "\tAPPEND %s\n" ${cmdline} >> ${OUTFILE} fi ENTRY=$(expr ${ENTRY} + 1) } diff --git a/srcpkgs/u-boot-menu/template b/srcpkgs/u-boot-menu/template index 31ef746ba3adef..5c5fb87639c8f6 100644 --- a/srcpkgs/u-boot-menu/template +++ b/srcpkgs/u-boot-menu/template @@ -1,7 +1,7 @@ # Template file for 'u-boot-menu' pkgname=u-boot-menu version=0.2 -revision=1 +revision=2 conf_files="/etc/default/extlinux" short_desc="Create an u-boot menu with currently available kernels" maintainer="Remi Pommarel "