From owner-svn-src-all@freebsd.org Sun May 3 03:54:51 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0164E2D25C6; Sun, 3 May 2020 03:54:51 +0000 (UTC) (envelope-from kevans@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49FBvZ3rNjz4B1m; Sun, 3 May 2020 03:54:50 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 772EF4F21; Sun, 3 May 2020 03:54:50 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0433soKc037175; Sun, 3 May 2020 03:54:50 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0433sncd037171; Sun, 3 May 2020 03:54:49 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <202005030354.0433sncd037171@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Sun, 3 May 2020 03:54:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r360597 - stable/11/stand/lua X-SVN-Group: stable-11 X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: stable/11/stand/lua X-SVN-Commit-Revision: 360597 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 May 2020 03:54:51 -0000 Author: kevans Date: Sun May 3 03:54:49 2020 New Revision: 360597 URL: https://svnweb.freebsd.org/changeset/base/360597 Log: MFC r352601: loader_lua: lua color changes should end with reset The color change should have reset sequence, not switch to white. Modified: stable/11/stand/lua/color.lua stable/11/stand/lua/logo-beastie.lua stable/11/stand/lua/logo-orb.lua stable/11/stand/lua/menu.lua Directory Properties: stable/11/ (props changed) Modified: stable/11/stand/lua/color.lua ============================================================================== --- stable/11/stand/lua/color.lua Sun May 3 03:53:38 2020 (r360596) +++ stable/11/stand/lua/color.lua Sun May 3 03:54:49 2020 (r360597) @@ -47,7 +47,7 @@ color.MAGENTA = 5 color.CYAN = 6 color.WHITE = 7 -color.DEFAULT = 0 +color.DEFAULT = 9 color.BRIGHT = 1 color.DIM = 2 @@ -70,7 +70,7 @@ function color.resetfg() if color.disabled then return '' end - return color.escapefg(color.WHITE) + return color.escapefg(color.DEFAULT) end function color.escapebg(color_value) @@ -84,7 +84,7 @@ function color.resetbg() if color.disabled then return '' end - return color.escapebg(color.BLACK) + return color.escapebg(color.DEFAULT) end function color.escape(fg_color, bg_color, attribute) @@ -104,7 +104,7 @@ function color.default() if color.disabled then return "" end - return color.escape(color.WHITE, color.BLACK, color.DEFAULT) + return color.escape(color.DEFAULT, color.DEFAULT) end function color.highlight(str) Modified: stable/11/stand/lua/logo-beastie.lua ============================================================================== --- stable/11/stand/lua/logo-beastie.lua Sun May 3 03:53:38 2020 (r360596) +++ stable/11/stand/lua/logo-beastie.lua Sun May 3 03:54:49 2020 (r360597) @@ -49,7 +49,7 @@ local beastie_color = { " \\ / /\\", " \027[36m______\027[31m( (_ / \\______/", " \027[36m,' ,-----' |", -" `--{__________)\027[37m" +" `--{__________)\027[m" } drawer.addLogo("beastie", { Modified: stable/11/stand/lua/logo-orb.lua ============================================================================== --- stable/11/stand/lua/logo-orb.lua Sun May 3 03:53:38 2020 (r360596) +++ stable/11/stand/lua/logo-orb.lua Sun May 3 03:54:49 2020 (r360597) @@ -45,7 +45,7 @@ local orb_color = { " -- \027[31;1m-.\027[31m", " `:` \027[31;1m`:`", " \027[31;1m.-- `--.", -" .---.....----.\027[37m" +" .---.....----.\027[m" } drawer.addLogo("orb", { Modified: stable/11/stand/lua/menu.lua ============================================================================== --- stable/11/stand/lua/menu.lua Sun May 3 03:53:38 2020 (r360596) +++ stable/11/stand/lua/menu.lua Sun May 3 03:54:49 2020 (r360597) @@ -47,10 +47,10 @@ local return_menu_entry = { local function OnOff(str, value) if value then return str .. color.escapefg(color.GREEN) .. "On" .. - color.escapefg(color.WHITE) + color.resetfg() else return str .. color.escapefg(color.RED) .. "off" .. - color.escapefg(color.WHITE) + color.resetfg() end end