X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/3fc0ed44dc2169d10a42f1c6f6ea39be7dc310dd..0c8671085b94a0e7b31f33c146695fb134f5a4e7:/helpers.lua?ds=inline diff --git a/helpers.lua b/helpers.lua index 08aba0d..1dfb09b 100644 --- a/helpers.lua +++ b/helpers.lua @@ -2,8 +2,7 @@ --[[ Licensed under GNU General Public License v2 - * (c) 2013, Luke Bonham - * (c) 2010-2012, Peter Hofmann + * (c) 2013, Luke Bonham --]] @@ -33,14 +32,17 @@ 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, "rb") - if f then f:close() end + local f = io.open(file) + 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 -- list/table if the file does not exist function helpers.lines_from(file) @@ -61,7 +63,7 @@ end -- get first non empty line from a file, -- returns nil otherwise function helpers.first_nonempty_line(file) - for k,v in pairs(lines_from(file)) do + for k,v in pairs(helpers.lines_from(file)) do if #v then return v end end return nil