X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/9cd85a25829cc600c05622c1f92a97b257918835..973b56ce0b9ce214b5dc17795893ece7def6ce78:/helpers.lua?ds=inline;pf=etc diff --git a/helpers.lua b/helpers.lua index f2bd5e4..dbee617 100644 --- a/helpers.lua +++ b/helpers.lua @@ -2,15 +2,14 @@ --[[ Licensed under GNU General Public License v2 - * (c) 2013, Luke Bonham - * (c) 2010-2012, Peter Hofmann + * (c) 2013, Luke Bonham --]] local debug = require("debug") local capi = { timer = timer } -local io = { open = io.open, +local io = { open = io.open, lines = io.lines } local rawget = rawget @@ -33,19 +32,23 @@ end -- {{{ File operations --- see if the file exists +-- see if the file exists and is readable function helpers.file_exists(file) local f = io.open(file) - if f then f:close() end + if f then + local s = f:read() + f:close() + f = s + end return f ~= nil end --- get all lines from a file, returns an empty +-- get all lines from a file, returns an empty -- list/table if the file does not exist function helpers.lines_from(file) if not helpers.file_exists(file) then return {} end lines = {} - for line in io.lines(file) do + for line in io.lines(file) do lines[#lines + 1] = line end return lines @@ -61,7 +64,7 @@ end -- returns nil otherwise function helpers.first_nonempty_line(file) for k,v in pairs(helpers.lines_from(file)) do - if #v then return v end + if #v then return v end end return nil end