From nobody Mon Feb 28 22:41:09 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 663CD19E2D94; Mon, 28 Feb 2022 22:41:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4K6wMp0zKqz3M08; Mon, 28 Feb 2022 22:41:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646088070; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=85vu+EgFJHrOHIuZYBzQdKec5oM/IfpdOKFPZDZn9cY=; b=L7ty49ESXba75L5XLymHngeCVJroDTUP4PNC+z95UKKHP+TFBmUvyRiOZyMRE3LCj/QEuk x8Y1ZzbnVDg2ClVa4PCo3IlEjAeXKLBBwtW/VaQVPUCJ8o7FZ8ZfO5jm5TRXtaEipc7HID C7/7qwbD3QssckznR1Gi2PnLkm6K7UpqaVgtyuHrPr0WWw9RMwsVTWPqiJ8kFUNzjtwh13 qKQUJLJaBxG1qG0LUYY0AXrCSKlDwbH1C60nmzDf0ZlbkCpaUxZlTxJnoU0NG6QwdPMoD8 yD2BzWPD7kGSgHdVJKp1kBLxtSv4Fvgd2XCIjZ9n42HF25WQyibqDc/AZ/gotg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BD0E923E18; Mon, 28 Feb 2022 22:41:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21SMf95W062946; Mon, 28 Feb 2022 22:41:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21SMf9Ef062945; Mon, 28 Feb 2022 22:41:09 GMT (envelope-from git) Date: Mon, 28 Feb 2022 22:41:09 GMT Message-Id: <202202282241.21SMf9Ef062945@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 17160f21efe8 - main - install-boot.sh: Avoid - in function names for POSIX compatibility List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 17160f21efe8e8ccaebe6f887624e4faab55f6c7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646088070; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=85vu+EgFJHrOHIuZYBzQdKec5oM/IfpdOKFPZDZn9cY=; b=DPBPFKVBTY37KR8ITXx7mdMIECzk+xxOpDXKd8Ly8J/8cw7jnONEIyLU4i8G+e601O7LqZ a56O1rPJ3Dug8h9QZjG0XjGXpWQ5AUoLVw7CNM08N89hcCe+S4pC0mKgjRQKmhsRNUPpc2 TNbmSIaKVgIE7IVYrEOHT9+TILTezMfK5CiW0L9mcs2h5UjyW1mivh7d1cNKKFxn4DxgiS nJbkH2Ncg5Lb1w+O2se7lZCseVkTuD+lnuzGOgxTqn3I21v46X5lwAK8oULc+FtictvB7T VsI9MLHo/jRaXdwYhTov4SCcI4bBsVy4sbw2CC71/LDf6TjbwM7+iM2Arqi+Lw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646088070; a=rsa-sha256; cv=none; b=kTp60oRITDoElICrG6ji2enqaaPdzBQ86CF9L8bvyIfc92/t7vOyaG+iphFvPIA6QP3ZxQ WPjqoh9rKHySLGtLuhQckl1LEDwtrEIDN71T0ZSa9O9VS3kSf55yF1+rqcdweSkcsDqF70 tlch3UxFnTmym7XIstL4oIinijlT68ZaKKQUijkmfwBKZm0HdHzyTmVV+VjiVXTJQW7K3s KOdp8dVRTjKyAHqdj4HBvdilry0GW7J0wnNM0xV24PUYU9mdlMpMu6zseXy6wSYd/maoi7 WfRSSQ15AYmv/jZFbXegl6vCiyAlmBbXz3p0xIseHjEEqwB2lWJwHWJ8OMfe1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=17160f21efe8e8ccaebe6f887624e4faab55f6c7 commit 17160f21efe8e8ccaebe6f887624e4faab55f6c7 Author: Jessica Clarke AuthorDate: 2022-02-28 22:37:21 +0000 Commit: Jessica Clarke CommitDate: 2022-02-28 22:37:21 +0000 install-boot.sh: Avoid - in function names for POSIX compatibility FreeBSD sh supports this but other common POSIX shells do not; in particular, dash does not, unlike bash and zsh. This allows the script to be used on non-FreeBSD systems for release media building. Reviewed by: emaste, brooks Differential Revision: https://reviews.freebsd.org/D34000 --- tools/boot/install-boot.sh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tools/boot/install-boot.sh b/tools/boot/install-boot.sh index ce6e363a3067..d86441f23259 100755 --- a/tools/boot/install-boot.sh +++ b/tools/boot/install-boot.sh @@ -24,7 +24,7 @@ doit() { eval $* } -find-part() { +find_part() { dev=$1 part=$2 @@ -190,9 +190,9 @@ make_esp_mbr() { dev=$1 dst=$2 - s=$(find-part $dev "!239") + s=$(find_part $dev "!239") if [ -z "$s" ] ; then - s=$(find-part $dev "efi") + s=$(find_part $dev "efi") if [ -z "$s" ] ; then die "No ESP slice found" fi @@ -204,7 +204,7 @@ make_esp_gpt() { dev=$1 dst=$2 - idx=$(find-part $dev "efi") + idx=$(find_part $dev "efi") if [ -z "$idx" ] ; then die "No ESP partition found" fi @@ -215,7 +215,7 @@ boot_nogeli_gpt_ufs_legacy() { dev=$1 dst=$2 - idx=$(find-part $dev "freebsd-boot") + idx=$(find_part $dev "freebsd-boot") if [ -z "$idx" ] ; then die "No freebsd-boot partition found" fi @@ -235,7 +235,7 @@ boot_nogeli_gpt_zfs_legacy() { dev=$1 dst=$2 - idx=$(find-part $dev "freebsd-boot") + idx=$(find_part $dev "freebsd-boot") if [ -z "$idx" ] ; then die "No freebsd-boot partition found" fi @@ -256,7 +256,7 @@ boot_nogeli_mbr_ufs_legacy() { dst=$2 doit gpart bootcode -b ${mbr0} ${dev} - s=$(find-part $dev "freebsd") + s=$(find_part $dev "freebsd") if [ -z "$s" ] ; then die "No freebsd slice found" fi @@ -277,11 +277,11 @@ boot_nogeli_mbr_zfs_legacy() { dst=$2 # search to find the BSD slice - s=$(find-part $dev "freebsd") + s=$(find_part $dev "freebsd") if [ -z "$s" ] ; then die "No BSD slice found" fi - idx=$(find-part ${dev}s${s} "freebsd-zfs") + idx=$(find_part ${dev}s${s} "freebsd-zfs") if [ -z "$idx" ] ; then die "No freebsd-zfs slice found" fi