From owner-svn-src-head@freebsd.org Mon Feb 19 15:47:11 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4DA0EF09E46; Mon, 19 Feb 2018 15:47:11 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C7CBB7B24C; Mon, 19 Feb 2018 15:47:09 +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 C2A551C848; Mon, 19 Feb 2018 15:47:09 +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 w1JFl98v073772; Mon, 19 Feb 2018 15:47:09 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1JFl9qu073771; Mon, 19 Feb 2018 15:47:09 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201802191547.w1JFl9qu073771@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Mon, 19 Feb 2018 15:47:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r329578 - head/stand/lua X-SVN-Group: head X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: head/stand/lua X-SVN-Commit-Revision: 329578 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Feb 2018 15:47:11 -0000 Author: kevans Date: Mon Feb 19 15:47:09 2018 New Revision: 329578 URL: https://svnweb.freebsd.org/changeset/base/329578 Log: stand/lua: Menu style.lua(9) nits Modified: head/stand/lua/menu.lua Modified: head/stand/lua/menu.lua ============================================================================== --- head/stand/lua/menu.lua Mon Feb 19 15:42:20 2018 (r329577) +++ head/stand/lua/menu.lua Mon Feb 19 15:47:09 2018 (r329578) @@ -52,7 +52,8 @@ menu.boot_options = { { entry_type = core.MENU_RETURN, name = function() - return "Back to main menu"..color.highlight(" [Backspace]"); + return "Back to main menu" .. + color.highlight(" [Backspace]"); end }, @@ -60,7 +61,8 @@ menu.boot_options = { { entry_type = core.MENU_ENTRY, name = function() - return "Load System "..color.highlight("D").."efaults"; + return "Load System " .. color.highlight("D") .. + "efaults"; end, func = function() core.setDefaults(); @@ -86,7 +88,8 @@ menu.boot_options = { { entry_type = core.MENU_ENTRY, name = function() - return OnOff(color.highlight("A").."CPI :", core.acpi); + return OnOff(color.highlight("A") .. "CPI :", + core.acpi); end, func = function() core.setACPI(); @@ -97,7 +100,8 @@ menu.boot_options = { { entry_type = core.MENU_ENTRY, name = function() - return OnOff("Safe "..color.highlight("M").."ode :", core.sm); + return OnOff("Safe " .. color.highlight("M") .. + "ode :", core.sm); end, func = function() core.setSafeMode(); @@ -108,7 +112,8 @@ menu.boot_options = { { entry_type = core.MENU_ENTRY, name = function() - return OnOff(color.highlight("S").."ingle user:", core.su); + return OnOff(color.highlight("S") .. "ingle user:", + core.su); end, func = function() core.setSingleUser(); @@ -119,7 +124,8 @@ menu.boot_options = { { entry_type = core.MENU_ENTRY, name = function() - return OnOff(color.highlight("V").."erbose :", core.verbose); + return OnOff(color.highlight("V") .. "erbose :", + core.verbose); end, func = function() core.setVerbose(); @@ -133,7 +139,8 @@ menu.welcome = { { entry_type = core.MENU_ENTRY, name = function() - return color.highlight("B").."oot Multi user "..color.highlight("[Enter]"); + return color.highlight("B") .. "oot Multi user " .. + color.highlight("[Enter]"); end, func = function() core.setSingleUser(false); @@ -146,7 +153,7 @@ menu.welcome = { { entry_type = core.MENU_ENTRY, name = function() - return "Boot "..color.highlight("S").."ingle user"; + return "Boot " .. color.highlight("S") .. "ingle user"; end, func = function() core.setSingleUser(true); @@ -159,7 +166,7 @@ menu.welcome = { { entry_type = core.MENU_RETURN, name = function() - return color.highlight("Esc").."ape to loader prompt"; + return color.highlight("Esc") .. "ape to loader prompt"; end, func = function() loader.setenv("autoboot_delay", "NO"); @@ -171,7 +178,7 @@ menu.welcome = { { entry_type = core.MENU_ENTRY, name = function() - return color.highlight("R").."eboot"; + return color.highlight("R") .. "eboot"; end, func = function() loader.perform("reboot"); @@ -229,7 +236,7 @@ menu.welcome = { { entry_type = core.MENU_SUBMENU, name = function() - return "Boot "..color.highlight("O").."ptions"; + return "Boot " .. color.highlight("O") .. "ptions"; end, submenu = function() return menu.boot_options; @@ -338,7 +345,7 @@ function menu.run(m) end function menu.skip() - if (core.isSerialBoot())then + if (core.isSerialBoot()) then return true; end local c = string.lower(loader.getenv("console") or ""); @@ -374,8 +381,9 @@ function menu.autoboot() repeat time = endtime - loader.time(); screen.setcursor(x, y); - print("Autoboot in "..time.." seconds, hit [Enter] to boot" - .." or any other key to stop "); + print("Autoboot in " .. time .. + " seconds, hit [Enter] to boot" .. + " or any other key to stop "); screen.defcursor(); if (io.ischar()) then local ch = io.getchar(); @@ -385,7 +393,7 @@ function menu.autoboot() -- erase autoboot msg screen.setcursor(0, y); print(" " - .." "); + .. " "); screen.defcursor(); return; end @@ -399,9 +407,11 @@ end function OnOff(str, b) if (b) then - return str .. color.escapef(color.GREEN).."On"..color.escapef(color.WHITE); + return str .. color.escapef(color.GREEN) .. "On" .. + color.escapef(color.WHITE); else - return str .. color.escapef(color.RED).."off"..color.escapef(color.WHITE); + return str .. color.escapef(color.RED) .. "off" .. + color.escapef(color.WHITE); end end