From nobody Fri May 23 13:40:31 2025 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 4b3mWM4HVGz5xGLm; Fri, 23 May 2025 13:40:31 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b3mWM3lGLz4NBJ; Fri, 23 May 2025 13:40:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748007631; 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=+FToX3JidRlQpYUtAF4ruujcO+5VyZUlJb6R6Dlcz6Y=; b=GuGHtEdHi5S+TYv2UvUikQOVHeMJAUUKZfNqidQy0LtbYOhG1VHq3KHIXWHutx1Hp/BRT5 qlXlhJQ7WQYy9aqcgRwIGxxwkf/SW0DNbv4AjsOf0JFGz7I5pCg3Y88WjiR/az3WngjAKt h2yo/B6NwEOKmPJugTt375XppMXlun0RdHGIvhBewR2euLXRVLFEVC+tVk4VywbGcd8lBY Y48dMR2bbTLHay2Oaj9zLql4jpouT7JwLztP9kkeN4hMaShmp8uEo+YvCHDtfh85ZpYjbQ e1cZaNmv87rW3jbZEkClinXrD3QCeiIpyykRdsSuHWJB3e7YNlzn79kPm8rfjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748007631; 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=+FToX3JidRlQpYUtAF4ruujcO+5VyZUlJb6R6Dlcz6Y=; b=PWnlpyF7VoO4ZMf5I5EXpFJi6y2hjVx7PYlH0y03TXpJLEJ91UcgQyVRCwhr0lDQN8MZYj ZQSjUia90xJtGyuyEhupEgEpAcgxS+VByrODpyA+yusGKg9IWfLk99mWMbk5AXRyiTaedj STW+soJB8Lt6ayt1Tgsuoq0zadbMLqC7QwgthZGozRlwdEHui6FSQ2//SEO6XjjYEE/tRK Jg0s0RPMQhY2rvWcxqnoql2GzxhvDMUre8KeoV3I17GmrW27FnQmrIp6woPMpNotwZW2mQ 4xkU61eU0ORxwqoeRXccav2F0yIZlzP6L9IjFq5o3qZ9A0ow998ydIuynmxlnQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748007631; a=rsa-sha256; cv=none; b=XSqrdYAkHmrKXtvpXq1gPILeim+PB1aMuT5C7vsjKJ/146osRHijml6bRiTDfc0PERhY5p AfSYzhDIjfHmsx85mZhis2xrQNxtk21YFH/Scb0dE1zhX9Z6hzwpTR+wP3lwve0zfZN3ii T4AJ/UMlEgH7cZZctCeSX1vv2zaEtvfiOAPkhvuQEBU4UJSj26p5fzGICw1T01rJwwczUm 55wrZznwvJUlz7kTeCRwbhemdh+s/4o0DrXiAgZz7/DgNkvE+ZqiwOvmPf+8PXA848xPX1 rcPL48Aas/nF8zpO9gIKMFuvH6zSii4BHH1Z49fV6KvHBo0Z76fROgIXdD2uHw== 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 4b3mWM3GYYz173X; Fri, 23 May 2025 13:40:31 +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 54NDeV2p011022; Fri, 23 May 2025 13:40:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54NDeVXQ011019; Fri, 23 May 2025 13:40:31 GMT (envelope-from git) Date: Fri, 23 May 2025 13:40:31 GMT Message-Id: <202505231340.54NDeVXQ011019@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 0bfa8a459626 - main - bsdinstall: improve pkgbase target retry prompts 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0bfa8a45962644947e17b5262c5d0efa36d3f4d9 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=0bfa8a45962644947e17b5262c5d0efa36d3f4d9 commit 0bfa8a45962644947e17b5262c5d0efa36d3f4d9 Author: Isaac Freund AuthorDate: 2025-05-09 12:21:01 +0000 Commit: Ed Maste CommitDate: 2025-05-23 13:40:12 +0000 bsdinstall: improve pkgbase target retry prompts These now use bsddialog rather than prompting the user for input on the console. Reviewed by: emaste Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50270 --- usr.sbin/bsdinstall/scripts/pkgbase.in | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/usr.sbin/bsdinstall/scripts/pkgbase.in b/usr.sbin/bsdinstall/scripts/pkgbase.in index eaed23a19548..1ff93afe817b 100755 --- a/usr.sbin/bsdinstall/scripts/pkgbase.in +++ b/usr.sbin/bsdinstall/scripts/pkgbase.in @@ -23,18 +23,6 @@ local function capture(command) return output:match("(.-)\n$") or output end -local function prompt_yn(question) - while true do - io.write(question .. " (y/n) ") - local input = io.read() - if input == "y" or input == "Y" then - return true - elseif input == "n" or input == "N" then - return false - end - end -end - local function append_list(list, other) for _, item in ipairs(other) do table.insert(list, item) @@ -73,6 +61,18 @@ local function bsddialog(args) return exit_code, output end +-- Prompts the user for a yes/no answer to the given question using bsddialog +-- Returns true if the user answers yes and false if the user answers no. +local function prompt_yn(question) + local exit_code = bsddialog({ + "--yesno", + "--disable-esc", + question, + 0, 0, -- autosize + }) + return exit_code == 0 +end + -- Creates a dialog for component selection mirroring the -- traditional tarball component selection dialog. local function select_components(components, options) @@ -254,7 +254,6 @@ local function pkgbase() while not os.execute(pkg .. "update") do if not prompt_yn("Updating repositories failed, try again?") then - print("Canceled") os.exit(1) end end @@ -263,7 +262,6 @@ local function pkgbase() while not os.execute(pkg .. "install -U -F -y -r FreeBSD-base " .. packages) do if not prompt_yn("Fetching packages failed, try again?") then - print("Canceled") os.exit(1) end end