Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] u-boot-menu: use printf instead of echo
@ 2021-03-15 22:11 Johnnynator
  2021-03-15 22:13 ` [PR PATCH] [Updated] " Johnnynator
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Johnnynator @ 2021-03-15 22:11 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1587 bytes --]

There is a new 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: 2529 bytes --]

From 7508984f40c5df9e4e0f378d836198d330e26cdc 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
---
 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 2c724b101ff0..6540060f9951 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" ${cmdline} >> ${OUTFILE}
 	fi
 	ENTRY=$(expr ${ENTRY} + 1)
 }
diff --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>"

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Updated] u-boot-menu: use printf instead of echo
  2021-03-15 22:11 [PR PATCH] u-boot-menu: use printf instead of echo Johnnynator
@ 2021-03-15 22:13 ` Johnnynator
  2021-03-16 18:30 ` Johnnynator
  2021-03-18 20:59 ` [PR PATCH] [Merged]: " Johnnynator
  2 siblings, 0 replies; 4+ messages in thread
From: Johnnynator @ 2021-03-15 22:13 UTC (permalink / raw)
  To: ml

[-- 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: 2529 bytes --]

From c13103c0312f7ce755337da874f9746d7abe56f9 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
---
 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 2c724b101ff0..6540060f9951 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" ${cmdline} >> ${OUTFILE}
 	fi
 	ENTRY=$(expr ${ENTRY} + 1)
 }
diff --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>"

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Updated] u-boot-menu: use printf instead of echo
  2021-03-15 22:11 [PR PATCH] u-boot-menu: use printf instead of echo Johnnynator
  2021-03-15 22:13 ` [PR PATCH] [Updated] " Johnnynator
@ 2021-03-16 18:30 ` Johnnynator
  2021-03-18 20:59 ` [PR PATCH] [Merged]: " Johnnynator
  2 siblings, 0 replies; 4+ messages in thread
From: Johnnynator @ 2021-03-16 18:30 UTC (permalink / raw)
  To: ml

[-- 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
---
 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 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)
 }
diff --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>"

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Merged]: u-boot-menu: use printf instead of echo
  2021-03-15 22:11 [PR PATCH] u-boot-menu: use printf instead of echo Johnnynator
  2021-03-15 22:13 ` [PR PATCH] [Updated] " Johnnynator
  2021-03-16 18:30 ` Johnnynator
@ 2021-03-18 20:59 ` Johnnynator
  2 siblings, 0 replies; 4+ messages in thread
From: Johnnynator @ 2021-03-18 20:59 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1424 bytes --]

There's a merged pull request on the void-packages repository

u-boot-menu: use printf instead of echo
https://github.com/void-linux/void-packages/pull/29498

Description:
<!-- 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
-->


^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-03-18 20:59 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-15 22:11 [PR PATCH] u-boot-menu: use printf instead of echo Johnnynator
2021-03-15 22:13 ` [PR PATCH] [Updated] " Johnnynator
2021-03-16 18:30 ` Johnnynator
2021-03-18 20:59 ` [PR PATCH] [Merged]: " Johnnynator

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).