Date: Sun, 5 Dec 2021 16:56:28 GMT From: Mateusz Piotrowski <0mp@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 94d31c72d87e - stable/12 - os-release: Quote variables as documented in the manual Message-ID: <202112051656.1B5GuSX5082558@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/12 has been updated by 0mp (doc, ports committer): URL: https://cgit.FreeBSD.org/src/commit/?id=94d31c72d87ee6746c665ee8af697c25768f9467 commit 94d31c72d87ee6746c665ee8af697c25768f9467 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2021-11-23 10:26:47 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2021-12-05 16:44:32 +0000 os-release: Quote variables as documented in the manual Variables must be quoted if they contain non-alphanumeric characters. Warner noted in the review that the lack of quoting causing problems here is rather an edge case. I believe that it's worth adding the quotes here anyway because this is what the specification says and there is no good reason not to follow it. Reviewed by: imp Approved by: imp (src) MFC after: 7 days (cherry picked from commit 169e06fa7852810f4ced2cce7a3c14ca9443bf39) --- libexec/rc/rc.d/os-release | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libexec/rc/rc.d/os-release b/libexec/rc/rc.d/os-release index 411348a43668..39d2cbe0086d 100755 --- a/libexec/rc/rc.d/os-release +++ b/libexec/rc/rc.d/os-release @@ -26,14 +26,14 @@ osrelease_start() t=$(mktemp -t os-release) cat > "$t" <<-__EOF__ NAME=FreeBSD - VERSION=$_version - VERSION_ID=$_version_id + VERSION="$_version" + VERSION_ID="$_version_id" ID=freebsd ANSI_COLOR="0;31" PRETTY_NAME="FreeBSD $_version" - CPE_NAME=cpe:/o:freebsd:freebsd:$_version_id - HOME_URL=https://FreeBSD.org/ - BUG_REPORT_URL=https://bugs.FreeBSD.org/ + CPE_NAME="cpe:/o:freebsd:freebsd:$_version_id" + HOME_URL="https://FreeBSD.org/" + BUG_REPORT_URL="https://bugs.FreeBSD.org/" __EOF__ install -C -o root -g wheel -m ${osrelease_perms} "$t" "${osrelease_file}" rm -f "$t"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202112051656.1B5GuSX5082558>