From nobody Wed Apr 10 19:04:20 2024 X-Original-To: dev-commits-ports-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 4VFC1K11sBz5FvQ5; Wed, 10 Apr 2024 19:04:21 +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 4VFC1K0R7Qz4N95; Wed, 10 Apr 2024 19:04:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712775861; 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=vB2pW1TBHFko1QdWKlKxqVmnMfwc1PAlLfbcVHmkjY4=; b=B8cM2JN83XfXujqMDhTtmb153vLfbnw1/Wkp3fGiNxtsDZOe+xy0xjNJJ+wUA8Lqm6x+j0 ndmg26jZZ8MfpYXoKUsgBBCmxp7xLcekg9B6fpnmNC6okuo4f2REIazAIFDttTdIvFqu/N m4wwshDdB+OIgsgJnI/0FRjISK/sijzmWTWtpWchgq9EXtsNNUAOWj3VMIids9GujSL5sI kosPAozeGY4TpRGm4T3Yt0tRP7KUYqCPIK16i7IGCRl8PYmN4qKxcuUEXqyRpwH0Sv7u70 TCS31Qe3nbYcMSKjXHraCdmP78S2Zvdzi6g8SrFXXb8rF08kZWyvhuz5nrZp/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712775861; a=rsa-sha256; cv=none; b=nur+wfi+pp25IN2rOexZFX06fovWYF1mLcp617KweUQjKr1+/T2O+Est6YS8Sy8CCQveDL YWcwsqtgBV23U8nN3mCphnzEp2RW3Iq3dXcM1jv3QHXXijPVqHOiyb7qaGYlGzulQAXOrQ /TBZZllg7qqVe/xLmfAvCQZlzmxMYzfeSYUIGu9R+YVqxxStgKRYt2aJGOVN49ack3cmLK uKnO0pdK1mz+dEBi2N2yA+4lURz/RRctC3hcx6U0MUjT3Gw5FnSgcux4925LTlm8ytsXDF MzHhPWBuZ+L9KwN0xmHxRkfdWnyoz7jd0ZVBE0vz5nWAfm+VUuA+N3ZkTAV3zg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712775861; 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=vB2pW1TBHFko1QdWKlKxqVmnMfwc1PAlLfbcVHmkjY4=; b=livke5h32eaTQr4dOsNqNi8FVXmfsXGxiih01gdB5MOMjIIXeliZPLRUQRqchOeijslCNP Th4eMNzjst5hHWkEhSAROTrvF7rD3ooVFnYgyPe4r/R/0Tp55tgM3aZb1rLwzH7NQaEh6o 0G2Ik/nvmxvfV5qQrYN0CQXA1+NmOzXSE3cB3KL0nPSRnB+ab15A6ydwf8/vK1AcLYeJsl Fn9J9uCMk2zRNdQcYrzeIvNK/8VA9zCQSrPoxMWUE91rE2QcyvztZypY4VYusMg/X6DIqh Bs+3yfcP585492o1hKSj/DnsAOK5+jYXs6PS/5RqsjJGtmvmWGVC+mlyEx6NAA== 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 4VFC1K02GYzpw5; Wed, 10 Apr 2024 19:04:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43AJ4K7b083222; Wed, 10 Apr 2024 19:04:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43AJ4KFM083219; Wed, 10 Apr 2024 19:04:20 GMT (envelope-from git) Date: Wed, 10 Apr 2024 19:04:20 GMT Message-Id: <202404101904.43AJ4KFM083219@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Michael Osipov Subject: git: 3887897fbaa0 - main - Mk/Scripts/do-users-groups.sh: Make message endings consistent (cleanup) List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: dev-commits-ports-main+owner@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: michaelo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3887897fbaa04969508f1385e855aa4540468e17 Auto-Submitted: auto-generated The branch main has been updated by michaelo: URL: https://cgit.FreeBSD.org/ports/commit/?id=3887897fbaa04969508f1385e855aa4540468e17 commit 3887897fbaa04969508f1385e855aa4540468e17 Author: Michael Osipov AuthorDate: 2023-11-22 11:30:32 +0000 Commit: Michael Osipov CommitDate: 2024-04-10 19:01:18 +0000 Mk/Scripts/do-users-groups.sh: Make message endings consistent (cleanup) Approved by: jrm (mentor), otis (mentor), rene (portmgr) Differential Revision: https://reviews.freebsd.org/D44694 --- Mk/Scripts/do-users-groups.sh | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Mk/Scripts/do-users-groups.sh b/Mk/Scripts/do-users-groups.sh index 7f57e91ed565..b4ddf5a8a5d3 100644 --- a/Mk/Scripts/do-users-groups.sh +++ b/Mk/Scripts/do-users-groups.sh @@ -52,12 +52,12 @@ if [ -n "${GROUPS}" ]; then error "** ${file} doesn't exist. Exiting." fi done - ${dp_ECHO_MSG} "===> Creating groups." - echo "echo \"===> Creating groups.\"" >> "${dp_UG_INSTALL}" + ${dp_ECHO_MSG} "===> Creating groups" + echo "echo \"===> Creating groups\"" >> "${dp_UG_INSTALL}" for group in ${GROUPS}; do # _bgpd:*:130: if ! grep -q "^${group}:" ${dp_GID_FILES}; then \ - error "** Cannot find any information about group \`${group}' in ${dp_GID_FILES}." + error "** Cannot find any information about group \`${group}' in ${dp_GID_FILES}" fi while read -r line; do # Do not change IFS for more than one command, if we @@ -75,10 +75,10 @@ if [ -n "${GROUPS}" ]; then gid=$((gid+dp_GID_OFFSET)) cat >> "${dp_UG_INSTALL}" <<-eot2 if ! \${PW} groupshow $group >/dev/null 2>&1; then - echo "Creating group '$group' with gid '$gid'." + echo "Creating group '$group' with gid '$gid'" \${PW} groupadd $group -g $gid else - echo "Using existing group '$group'." + echo "Using existing group '$group'" fi eot2 done <<-eot @@ -100,7 +100,7 @@ if [ -n "${USERS}" ]; then for user in ${USERS}; do # _bgpd:*:130:130:BGP Daemon:/var/empty:/sbin/nologin if ! grep -q "^${user}:" ${dp_UID_FILES} ; then - error "** Cannot find any information about user \`${user}' in ${dp_UID_FILES}." + error "** Cannot find any information about user \`${user}' in ${dp_UID_FILES}" fi while read -r line; do # Do not change IFS for more than one command, if we @@ -128,10 +128,10 @@ if [ -n "${USERS}" ]; then homedir=$(echo "$homedir" | sed "s|^/usr/local|${dp_PREFIX}|") cat >> "${dp_UG_INSTALL}" <<-eot2 if ! \${PW} usershow $login >/dev/null 2>&1; then - echo "Creating user '$login' with uid '$uid'." + echo "Creating user '$login' with uid '$uid'" \${PW} useradd $login -u $uid -g $gid $class -c "$gecos" -d $homedir -s $shell else - echo "Using existing user '$login'." + echo "Using existing user '$login'" fi eot2 case $homedir in @@ -184,7 +184,7 @@ if [ -n "${GROUPS}" ]; then if [ -n "${user}" ] && [ "${user}" = "${login}" ]; then cat >> "${dp_UG_INSTALL}" <<-eot2 if ! \${PW} groupshow ${group} | grep -qw ${login}; then - echo "Adding user '${login}' to group '${group}'." + echo "Adding user '${login}' to group '${group}'" \${PW} groupmod ${group} -m ${login} fi eot2 @@ -202,7 +202,7 @@ if [ -n "${USERS}" ]; then if ! echo "${dp_USERS_BLACKLIST}" | grep -qw "${user}"; then cat >> "${dp_UG_DEINSTALL}" <<-eot if \${PW} usershow ${user} >/dev/null 2>&1; then - echo "==> You should manually remove the \"${user}\" user. " + echo "==> You should manually remove the \"${user}\" user" fi eot fi @@ -214,7 +214,7 @@ if [ -n "${GROUPS}" ]; then if ! echo "${dp_GROUPS_BLACKLIST}" | grep -qw "${group}"; then cat >> "${dp_UG_DEINSTALL}" <<-eot if \${PW} groupshow ${group} >/dev/null 2>&1; then - echo "==> You should manually remove the \"${group}\" group " + echo "==> You should manually remove the \"${group}\" group" fi eot fi