wiki submodule updated

[etc/awesome.git] / helpers.lua

diff --git a/helpers.lua b/helpers.lua
index 08aba0d7d454d6d7b3ba78cdc9568dd737a0614a..9c4a83fe90fd756fdfebfb32c41265cd4f7015a8 100644 (file)
--- a/helpers.lua
+++ b/helpers.lua
@@ -2,15 +2,14 @@
 --[[
                                                   
      Licensed under GNU General Public License v2 
 --[[
                                                   
      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 debug  = require("debug")
 
 local capi   = { timer = timer }

-local io     = { open = io.open,
+local io     = { open  = io.open,

                  lines = io.lines }
 local rawget = rawget
 
                  lines = io.lines }
 local rawget = rawget
 


@@ -33,14 +32,17 @@ end
 
 -- {{{ File operations
 
 
 -- {{{ File operations
 

--- see if the file exists
+-- see if the file exists and is readable

 function helpers.file_exists(file)
 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
 
   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)
 -- 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)
 -- 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
     if #v then return v end 
   end
   return nil