From nobody Thu Sep 11 01:06:27 2025 X-Original-To: dev-commits-src-all@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 4cMfX41h8dz67MtC; Thu, 11 Sep 2025 01:06:28 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cMfX4187Fz3TwH; Thu, 11 Sep 2025 01:06:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757552788; 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=KgvFinos8i04B6bv1fv7BK9qlCwy6AKQcpFpW4NHgCA=; b=dKAr8UglnNRnzYzlIFpOD4uiSNUi6fmZb+NQapAS98tDgiluJCM/wuEEP62ZAzXTDQuXbl 3aEIRIdXRqg+W8h+5s09qNQQuf+PMKiED+x59MLYauqcc1L62VwGE9/9bPLSKExEspx5wA n7OUugroKZwvDpu/AgOZL5MCukddPgtKhZtafeTp2jAzlz6o+EwcKrtrlRRL8VGuyZH4Gi rVlxarIDHliCXJ6m0r9ANLmcetBRlfp2Awg9OEGBjnOTUkBndFoJeG29RuyFAqJQpbNvqy dfKtMuZfN/x7x4yOJeQFk7jgs131h2SCcQdTAh5ntkS6myx0XdMXQ8zdy9L3eA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757552788; 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=KgvFinos8i04B6bv1fv7BK9qlCwy6AKQcpFpW4NHgCA=; b=HjtVaxmtjGz42h4CZDFEVHdhSaF/dKOh2jps8MLEyMkuPXwMx3LdxvlGHoguZW+mYIMwGl uuKGFQXhiQZae5ShgqQdMfulgd+tIgePElRm4Y8UwxAsGu3egwhS57I2bbTR/U21ncAV4n 7Af/8HHximjEgNisZOOjGaAP4cDBzjBvzvnCvZ+1gBWrwYyPDDe+rzdSw+nrKB+YHIh26j BnshxI61Rd0GAaAANGsE+QrL/w3+CFX1z9z8CZrBKQCDsgYqKVcisKzPkCA3bemlthb7uN N9HLO7vk+ui++XNogDp2ytuAt93fvEXED8ldUzT6Q3i0CxSGyPbLNqRzVFD2SQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757552788; a=rsa-sha256; cv=none; b=m8+AF9DgL+jB4SoLqn7BxInlnwLxBCBnD7AgKVCRGfeLoUYoh53JOyBeviYDsEQ0Rrgxtb NYBYivk5SFiXKINVKwKC0RbOzfx8q6FKbLTkeZJW3cjF9TfwCvN6fzEhfPoOYx5W5yX7t/ Mw55dX28eUC7gqePg/9pXhbuQx6tbthv+EtmCnwFFQOOPv3GqHOnl605TkSiy2nGgq6KKa TKvXSbSjWbEnJgvQ3mFbPmyLVvotVn87M6vr3mY0O3LfT+ShPOkzKzh4txdi3hZzDUic9T N8c4Gb614piXmFNXaUj8pa45JHBQJGw94KNr050OxT8g5sV2t6BEdXz4D+9elA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cMfX40gKCzm2j; Thu, 11 Sep 2025 01:06:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58B16Ran084185; Thu, 11 Sep 2025 01:06:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58B16Rad084182; Thu, 11 Sep 2025 01:06:27 GMT (envelope-from git) Date: Thu, 11 Sep 2025 01:06:27 GMT Message-Id: <202509110106.58B16Rad084182@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Ziaee Subject: git: fc68f8aac623 - main - rmuser.sh: Improve prompt consistency with adduser List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fc68f8aac623b5494484adfa41ac600415609870 Auto-Submitted: auto-generated The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=fc68f8aac623b5494484adfa41ac600415609870 commit fc68f8aac623b5494484adfa41ac600415609870 Author: Alexander Ziaee AuthorDate: 2025-09-09 17:06:29 +0000 Commit: Alexander Ziaee CommitDate: 2025-09-11 00:43:37 +0000 rmuser.sh: Improve prompt consistency with adduser While here, improve userlist error message. PR: 289399 MFC after: 3 days Reviewed by: kbowling, rgrimes Approved by: kbowling, rgrimes (src) Reported by: michaeldexter, rgrimes Differential Revision: https://reviews.freebsd.org/D52464 --- usr.sbin/adduser/rmuser.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/usr.sbin/adduser/rmuser.sh b/usr.sbin/adduser/rmuser.sh index 4c1e4049763a..8e5dd28cf01f 100644 --- a/usr.sbin/adduser/rmuser.sh +++ b/usr.sbin/adduser/rmuser.sh @@ -303,7 +303,7 @@ if [ ! "$userlist" ]; then show_usage exit 1 else - echo -n "Please enter one or more usernames: " + echo -n "Please enter one or more usernames, or press enter to exit: " read userlist fi fi @@ -333,11 +333,11 @@ for _user in $userlist ; do echo echo $userrec echo - if ! prompt_yesno "Is this the entry you wish to remove? " ; then + if ! prompt_yesno "Is this the entry you wish to remove? (yes/no): " ; then continue fi _homedir=`echo $userrec | awk -F: '{print $9}'` - if prompt_yesno "Remove user's home directory ($_homedir)? "; then + if prompt_yesno "Remove user's home directory? [$_homedir] (yes/no): "; then pw_rswitch="-r" fi else