Merged with upstream

[etc/awesome.git] / helpers.lua

diff --git a/helpers.lua b/helpers.lua
index 1dfb09b6b40aca21296227d79ce23f65c5658844..4e90e169c15a570bb31aa4c6fa3f1ac9e70c5336 100644 (file)
--- a/helpers.lua
+++ b/helpers.lua
@@ -9,8 +9,9 @@
 local debug  = require("debug")
 
 local capi   = { timer = timer }
 local debug  = require("debug")
 
 local capi   = { timer = timer }

-local io     = { open = io.open,
-                 lines = io.lines }
+local io     = { open  = io.open,
+                 lines = io.lines,
+                 popen = io.popen }

 local rawget = rawget
 
 -- Lain helper functions for internal use
 local rawget = rawget
 
 -- Lain helper functions for internal use


@@ -43,12 +44,12 @@ function helpers.file_exists(file)
   return f ~= nil
 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 = {}
 -- 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
     lines[#lines + 1] = line
   end
   return lines


@@ -64,7 +65,7 @@ end
 -- returns nil otherwise
 function helpers.first_nonempty_line(file)
   for k,v in pairs(helpers.lines_from(file)) do
 -- 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
   end
   return nil
 end


@@ -86,6 +87,18 @@ end
 
 -- }}}
 
 
 -- }}}
 

+-- {{{ Pipe operations
+
+-- read the full output of a pipe (command)
+function helpers.read_pipe(cmd)
+   local f = assert(io.popen(cmd))
+   local output = f:read("*all")
+   f:close()
+   return output
+end
+
+-- }}}
+

 -- {{{ A map utility
 
 helpers.map_table = {}
 -- {{{ A map utility
 
 helpers.map_table = {}