From nobody Fri Sep 19 00:46:15 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 4cSYj35yJ8z68Hwb; Fri, 19 Sep 2025 00:46:15 +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 4cSYj34Swtz439w; Fri, 19 Sep 2025 00:46:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758242775; 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=P2WL+AVs5HUpZO959l1Y3arW9PGfnS9s2TMJgXUMUSI=; b=mYwhq0QsUpPlKYx8QDzrjUXSELk+2fO0EHzpMkF66CjTQSz8Q3e3TakHui5L8opF+hPqND O+1VZcWQdKEZczkXkgEKE2Vcon+4mNIIHEaeGl1kmgPKEbi9fYkZgUHFqXGBNIuQZXBeIR c96v1r0YQYPyApJAaQWyfYOWQnWsjmkZK7/BA+tEwBNVh2/x+5f2qIYZ81sYUODUnyCw9c T99wCrg9O24gt02i78b0EjPA+xIDZUErKu2oDB/k2+DAB8DwEuuo2U3skxsvBuR91NG7Mn 6981HT/VmRSGDEEUe1z+XwgUgwNp9ge+b97CuZ4ZrChXKNDbIvXG92f2pWrp4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758242775; 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=P2WL+AVs5HUpZO959l1Y3arW9PGfnS9s2TMJgXUMUSI=; b=i6rGSosnRiHwASg5zAFbdUylmVU2j8dfxH0FdfH7njq4HAHku0Z8VYVJBWUsGWQ9CsaoQ2 oooL7xdhOgE2hQQpMo5IPfA4bPGGTwM+sxqywfqID3EnG97V6T/8w8gPGjpJB4QDjuRZ/7 G47gDeR0O4v2tS0tiiw5W4bhju1qTCoCQMRZp7QE7GYIJ6PbjZoayGvI4+g3SIFF5EgPVb oKa1FTKijS/x7K8Z/iB8tz1FpUYBciLVGOKdK8WCJ1iVgPANbP0A6Rto1Q5mIOfazbgZir eqN9DQwiw7VXKH6L43EcBfYqoTaWQovAspEgqVTfXU2UzF7jdZuRl+6sRkNN4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758242775; a=rsa-sha256; cv=none; b=xw14ZKOTtzFoZo704+qTL0szKDZeHQsIP/pGoBQkD3EGDx3Z9s62vEj83AxAuyPh2Zr9oO fHOPGGAtsnja6FakRraOMqCVF7QP4nbMR8NpI7opVSAEbjXPYsG47Y0gH0qG27T93XxtiT XnYOsn8lH8jISWt0DRZNu0Stbr1Na6aG7h8oDB6R80s9SJSSCsDwWUqpN61MdFItLE3PWQ kk2tVAo93fwwdOaKsgm7a058OJcFUA2o4QNJAqYItYITgaJx+hruVQSaHutdnS6F20WaQv gyfrYbXjUS/agxD5HfevXMU6Uc6yZrywZ8Y/U72yEQcTlgxb1V88xbcNCm4LPg== 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 4cSYj342MlzbQ4; Fri, 19 Sep 2025 00:46:15 +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 58J0kFff008768; Fri, 19 Sep 2025 00:46:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58J0kFTX008765; Fri, 19 Sep 2025 00:46:15 GMT (envelope-from git) Date: Fri, 19 Sep 2025 00:46:15 GMT Message-Id: <202509190046.58J0kFTX008765@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: c8d87fd983e9 - stable/15 - 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/stable/15 X-Git-Reftype: branch X-Git-Commit: c8d87fd983e96785a58967fca40db6d2f2a3a850 Auto-Submitted: auto-generated The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=c8d87fd983e96785a58967fca40db6d2f2a3a850 commit c8d87fd983e96785a58967fca40db6d2f2a3a850 Author: Alexander Ziaee AuthorDate: 2025-09-09 17:06:29 +0000 Commit: Alexander Ziaee CommitDate: 2025-09-19 00:45:25 +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 (cherry picked from commit fc68f8aac623b5494484adfa41ac600415609870) --- 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