Date: Thu, 22 Feb 2018 20:10:24 +0000 (UTC) From: Kyle Evans <kevans@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r329836 - head/stand/lua Message-ID: <201802222010.w1MKAOPG011985@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kevans Date: Thu Feb 22 20:10:23 2018 New Revision: 329836 URL: https://svnweb.freebsd.org/changeset/base/329836 Log: lualoader: Attend to some 80-col issues, pointed out by luacheck Graphics have a tendency to cause 80-col issues, so make an exception to our standard indentation guidelines for these graphics. This does not hamper readability too badly. Two 40-column strings of spaces is trivially replaced with string.rep(" ", 80) Modified: head/stand/lua/config.lua head/stand/lua/drawer.lua head/stand/lua/menu.lua Modified: head/stand/lua/config.lua ============================================================================== --- head/stand/lua/config.lua Thu Feb 22 20:09:21 2018 (r329835) +++ head/stand/lua/config.lua Thu Feb 22 20:10:23 2018 (r329836) @@ -336,7 +336,8 @@ function config.loadkernel(other_kernel) local try_load = function (names) for name in names:gmatch("([^;]+)%s*;?") do - local r = loader.perform("load " .. flags .. " " .. name) + local r = loader.perform("load " .. flags .. + " " .. name) if r == 0 then return name end Modified: head/stand/lua/drawer.lua ============================================================================== --- head/stand/lua/drawer.lua Thu Feb 22 20:09:21 2018 (r329835) +++ head/stand/lua/drawer.lua Thu Feb 22 20:10:23 2018 (r329836) @@ -65,109 +65,109 @@ local shift_brand_text = function(shift) end fbsd_logo = { - " ______ ____ _____ _____ ", - " | ____| | _ \\ / ____| __ \\ ", - " | |___ _ __ ___ ___ | |_) | (___ | | | |", - " | ___| '__/ _ \\/ _ \\| _ < \\___ \\| | | |", - " | | | | | __/ __/| |_) |____) | |__| |", - " | | | | | | || | | |", - " |_| |_| \\___|\\___||____/|_____/|_____/ " +" ______ ____ _____ _____ ", +" | ____| | _ \\ / ____| __ \\ ", +" | |___ _ __ ___ ___ | |_) | (___ | | | |", +" | ___| '__/ _ \\/ _ \\| _ < \\___ \\| | | |", +" | | | | | __/ __/| |_) |____) | |__| |", +" | | | | | | || | | |", +" |_| |_| \\___|\\___||____/|_____/|_____/ " } beastie_color = { - " \027[31m, ,", - " /( )`", - " \\ \\___ / |", - " /- \027[37m_\027[31m `-/ '", - " (\027[37m/\\/ \\\027[31m \\ /\\", - " \027[37m/ / |\027[31m ` \\", - " \027[34mO O \027[37m) \027[31m/ |", - " \027[37m`-^--'\027[31m`< '", - " (_.) _ ) /", - " `.___/` /", - " `-----' /", - " \027[33m<----.\027[31m __ / __ \\", - " \027[33m<----|====\027[31mO)))\027[33m==\027[31m) \\) /\027[33m====|", - " \027[33m<----'\027[31m `--' `.__,' \\", - " | |", - " \\ / /\\", - " \027[36m______\027[31m( (_ / \\______/", - " \027[36m,' ,-----' |", - " `--{__________)\027[37m" +" \027[31m, ,", +" /( )`", +" \\ \\___ / |", +" /- \027[37m_\027[31m `-/ '", +" (\027[37m/\\/ \\\027[31m \\ /\\", +" \027[37m/ / |\027[31m ` \\", +" \027[34mO O \027[37m) \027[31m/ |", +" \027[37m`-^--'\027[31m`< '", +" (_.) _ ) /", +" `.___/` /", +" `-----' /", +" \027[33m<----.\027[31m __ / __ \\", +" \027[33m<----|====\027[31mO)))\027[33m==\027[31m) \\) /\027[33m====|", +" \027[33m<----'\027[31m `--' `.__,' \\", +" | |", +" \\ / /\\", +" \027[36m______\027[31m( (_ / \\______/", +" \027[36m,' ,-----' |", +" `--{__________)\027[37m" } beastie = { - " , ,", - " /( )`", - " \\ \\___ / |", - " /- _ `-/ '", - " (/\\/ \\ \\ /\\", - " / / | ` \\", - " O O ) / |", - " `-^--'`< '", - " (_.) _ ) /", - " `.___/` /", - " `-----' /", - " <----. __ / __ \\", - " <----|====O)))==) \\) /====|", - " <----' `--' `.__,' \\", - " | |", - " \\ / /\\", - " ______( (_ / \\______/", - " ,' ,-----' |", - " `--{__________)" +" , ,", +" /( )`", +" \\ \\___ / |", +" /- _ `-/ '", +" (/\\/ \\ \\ /\\", +" / / | ` \\", +" O O ) / |", +" `-^--'`< '", +" (_.) _ ) /", +" `.___/` /", +" `-----' /", +" <----. __ / __ \\", +" <----|====O)))==) \\) /====|", +" <----' `--' `.__,' \\", +" | |", +" \\ / /\\", +" ______( (_ / \\______/", +" ,' ,-----' |", +" `--{__________)" } fbsd_logo_v = { - " ______", - " | ____| __ ___ ___ ", - " | |__ | '__/ _ \\/ _ \\", - " | __|| | | __/ __/", - " | | | | | | |", - " |_| |_| \\___|\\___|", - " ____ _____ _____", - " | _ \\ / ____| __ \\", - " | |_) | (___ | | | |", - " | _ < \\___ \\| | | |", - " | |_) |____) | |__| |", - " | | | |", - " |____/|_____/|_____/" +" ______", +" | ____| __ ___ ___ ", +" | |__ | '__/ _ \\/ _ \\", +" | __|| | | __/ __/", +" | | | | | | |", +" |_| |_| \\___|\\___|", +" ____ _____ _____", +" | _ \\ / ____| __ \\", +" | |_) | (___ | | | |", +" | _ < \\___ \\| | | |", +" | |_) |____) | |__| |", +" | | | |", +" |____/|_____/|_____/" } orb_color = { - " \027[31m``` \027[31;1m`\027[31m", - " s` `.....---...\027[31;1m....--.``` -/\027[31m", - " +o .--` \027[31;1m/y:` +.\027[31m", - " yo`:. \027[31;1m:o `+-\027[31m", - " y/ \027[31;1m-/` -o/\027[31m", - " .- \027[31;1m::/sy+:.\027[31m", - " / \027[31;1m`-- /\027[31m", - " `: \027[31;1m:`\027[31m", - " `: \027[31;1m:`\027[31m", - " / \027[31;1m/\027[31m", - " .- \027[31;1m-.\027[31m", - " -- \027[31;1m-.\027[31m", - " `:` \027[31;1m`:`", - " \027[31;1m.-- `--.", - " .---.....----.\027[37m" +" \027[31m``` \027[31;1m`\027[31m", +" s` `.....---...\027[31;1m....--.``` -/\027[31m", +" +o .--` \027[31;1m/y:` +.\027[31m", +" yo`:. \027[31;1m:o `+-\027[31m", +" y/ \027[31;1m-/` -o/\027[31m", +" .- \027[31;1m::/sy+:.\027[31m", +" / \027[31;1m`-- /\027[31m", +" `: \027[31;1m:`\027[31m", +" `: \027[31;1m:`\027[31m", +" / \027[31;1m/\027[31m", +" .- \027[31;1m-.\027[31m", +" -- \027[31;1m-.\027[31m", +" `:` \027[31;1m`:`", +" \027[31;1m.-- `--.", +" .---.....----.\027[37m" } orb = { - " ``` `", - " s` `.....---.......--.``` -/", - " +o .--` /y:` +.", - " yo`:. :o `+-", - " y/ -/` -o/", - " .- ::/sy+:.", - " / `-- /", - " `: :`", - " `: :`", - " / /", - " .- -.", - " -- -.", - " `:` `:`", - " .-- `--.", - " .---.....----." +" ``` `", +" s` `.....---.......--.``` -/", +" +o .--` /y:` +.", +" yo`:. :o `+-", +" y/ -/` -o/", +" .- ::/sy+:.", +" / `-- /", +" `: :`", +" `: :`", +" / /", +" .- -.", +" -- -.", +" `:` `:`", +" .-- `--.", +" .---.....----." } none = {""} Modified: head/stand/lua/menu.lua ============================================================================== --- head/stand/lua/menu.lua Thu Feb 22 20:09:21 2018 (r329835) +++ head/stand/lua/menu.lua Thu Feb 22 20:10:23 2018 (r329836) @@ -456,8 +456,7 @@ function menu.autoboot() else -- erase autoboot msg screen.setcursor(0, y) - print(" " - .. " ") + print(string.rep(" ", 80)) screen.defcursor() return ch end
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201802222010.w1MKAOPG011985>