Re: installer: apple arm64: simplify firmware copy

2023-03-26 Thread Andrew Hewus Fresh
On Sat, Mar 25, 2023 at 06:38:56PM +, Klemens Nanni wrote:
> Less duplicate code, simpler to cope with newer firmware.
> Same idiom is used in install.sub already.
> 
> OK?

While unlikely to fail, I do prefer `cd ... && ...` as a general rule.

However, this definitely makes it easier to tell that we're doing the
same thing.

OK afresh1@

 
> Index: ramdisk/install.md
> ===
> RCS file: /cvs/src/distrib/arm64/ramdisk/install.md,v
> retrieving revision 1.37
> diff -u -p -r1.37 install.md
> --- ramdisk/install.md25 Mar 2023 18:29:37 -  1.37
> +++ ramdisk/install.md25 Mar 2023 18:35:52 -
> @@ -55,14 +55,9 @@ md_installboot() {
>  
>   case $_plat in
>   apple)
> - if [[ -d /etc/firmware/apple ]]; then
> - (cd /etc/firmware
> - pax -rw apple /mnt/etc/firmware)
> - fi
> - if [[ -d /etc/firmware/apple-bwfm ]]; then
> - (cd /etc/firmware
> - pax -rw apple-bwfm /mnt/etc/firmware)
> - fi
> + (cd /etc/firmware; for _dir in apple{,-bwfm}; do
> + [[ -d $_dir ]] && pax -rw $_dir /mnt/etc/firmware
> + done)
>   ;;
>   pine64)
>   dd if=$_mdec/u-boot-sunxi-with-spl.bin of=${_disk}c \
> 



installer: apple arm64: simplify firmware copy

2023-03-25 Thread Klemens Nanni
Less duplicate code, simpler to cope with newer firmware.
Same idiom is used in install.sub already.

OK?

Index: ramdisk/install.md
===
RCS file: /cvs/src/distrib/arm64/ramdisk/install.md,v
retrieving revision 1.37
diff -u -p -r1.37 install.md
--- ramdisk/install.md  25 Mar 2023 18:29:37 -  1.37
+++ ramdisk/install.md  25 Mar 2023 18:35:52 -
@@ -55,14 +55,9 @@ md_installboot() {
 
case $_plat in
apple)
-   if [[ -d /etc/firmware/apple ]]; then
-   (cd /etc/firmware
-   pax -rw apple /mnt/etc/firmware)
-   fi
-   if [[ -d /etc/firmware/apple-bwfm ]]; then
-   (cd /etc/firmware
-   pax -rw apple-bwfm /mnt/etc/firmware)
-   fi
+   (cd /etc/firmware; for _dir in apple{,-bwfm}; do
+   [[ -d $_dir ]] && pax -rw $_dir /mnt/etc/firmware
+   done)
;;
pine64)
dd if=$_mdec/u-boot-sunxi-with-spl.bin of=${_disk}c \