From: kn <kn@openbsd.org>
Date: Tue, 4 Oct 2022 19:34:44 +0000 (+0000)
Subject: sh(1) is not make(1), use newlines inside double quotes
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=d901c601a30df9efa9cd7c778cd1c3a94b8d323c;p=openbsd

sh(1) is not make(1), use newlines inside double quotes

sh(1) happily accepts newlines inside double quotes just like in scripts:

        $ sh -c "echo foo
	echo bar"
	foo
	bar

So no need to squash things into a single line as usually done inside make
targets where each makefile line is considered its own script unless
continued with trailing backslashes.

OK millert
---

diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub
index 651eae478d1..8af91b509c0 100644
--- a/distrib/miniroot/install.sub
+++ b/distrib/miniroot/install.sub
@@ -1,5 +1,5 @@
 #!/bin/ksh
-#	$OpenBSD: install.sub,v 1.1207 2022/09/27 12:28:25 kn Exp $
+#	$OpenBSD: install.sub,v 1.1208 2022/10/04 19:34:44 kn Exp $
 #
 # Copyright (c) 1997-2015 Todd Miller, Theo de Raadt, Ken Westerback
 # Copyright (c) 2015, Robert Peichaer <rpe@openbsd.org>
@@ -2927,10 +2927,10 @@ __EOT
 		mkdir -m 700 -p $_kernel_dir
 		tar -C $_kernel_dir -xzf $_kernel_dir.tgz $_kernel
 		rm -f $_kernel_dir.tgz
-		chroot /mnt /bin/ksh -e -c "cd ${_kernel_dir#/mnt}/$_kernel; \
-			make newbsd; \
-			[ -f /etc/bsd.re-config ] && \
-			    config -e -c /etc/bsd.re-config -f bsd; \
+		chroot /mnt /bin/ksh -e -c "cd ${_kernel_dir#/mnt}/$_kernel
+			make newbsd
+			[ -f /etc/bsd.re-config ] &&
+				config -e -c /etc/bsd.re-config -f bsd
 			make newinstall"
 		) >/dev/null 2>&1 && echo " done." || echo " failed."
 	fi