From: Johnnynator <Johnnynator@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] u-boot-menu: use printf instead of echo
Date: Tue, 16 Mar 2021 19:30:46 +0100 [thread overview]
Message-ID: <20210316183046.gKh21GCqGzZcura2rEZjuEleDHfTp44kjh6LOis0jfw@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29498@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1592 bytes --]
There is an updated pull request by Johnnynator against master on the void-packages repository
https://github.com/Johnnynator/void-packages u-boot-menu
https://github.com/void-linux/void-packages/pull/29498
u-boot-menu: use printf instead of echo
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/29498.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-u-boot-menu-29498.patch --]
[-- Type: text/x-diff, Size: 2531 bytes --]
From de1bfc0254877ef4f28feb976ebc3643db8da4ba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
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
---
| 20 ++++++++++----------
| 2 +-
2 files changed, 11 insertions(+), 11 deletions(-)
--git a/srcpkgs/u-boot-menu/files/kernel.d/extlinux b/srcpkgs/u-boot-menu/files/kernel.d/extlinux
index 2c724b101ff0..5a4465698a46 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)
}
--git a/srcpkgs/u-boot-menu/template b/srcpkgs/u-boot-menu/template
index 31ef746ba3ad..5c5fb87639c8 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 <repk@triplefau.lt>"
next prev parent reply other threads:[~2021-03-16 18:30 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-15 22:11 [PR PATCH] " Johnnynator
2021-03-15 22:13 ` [PR PATCH] [Updated] " Johnnynator
2021-03-16 18:30 ` Johnnynator [this message]
2021-03-18 20:59 ` [PR PATCH] [Merged]: " Johnnynator
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210316183046.gKh21GCqGzZcura2rEZjuEleDHfTp44kjh6LOis0jfw@z \
--to=johnnynator@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).