Merge pull request #381 from cool-cool-sweat/helpers-change

[etc/awesome.git] / helpers.lua

diff --git a/helpers.lua b/helpers.lua
index 4e5ce1facc505c5a78617fa40181120b4f1f5826..b5b663d8cdc8652f8e87c022a75b7b0512dbc2cd 100644 (file)
--- a/helpers.lua
+++ b/helpers.lua
@@ -1,13 +1,11 @@
-
 --[[
-                                                  
-     Licensed under GNU General Public License v2 
-      * (c) 2013, Luke Bonham                     
-                                                  
---]]
 
+     Licensed under GNU General Public License v2
+      * (c) 2013, Luke Bonham
 
-local easy_async = require("awful.spawn").easy_async
+--]]
+
+local spawn      = require("awful.spawn")
 local timer      = require("gears.timer")
 local debug      = require("debug")
 local io         = { lines = io.lines,
@@ -112,12 +110,29 @@ end
 -- @param callback function to execute on cmd output
 -- @return cmd PID
 function helpers.async(cmd, callback)
-    return easy_async(cmd,
+    return spawn.easy_async(cmd,
+    function (stdout, stderr, reason, exit_code)
+        callback(stdout, exit_code)
+    end)
+end
+
+-- like above, but call spawn.easy_async with a shell
+function helpers.async_with_shell(cmd, callback)
+    return spawn.easy_async_with_shell(cmd,
     function (stdout, stderr, reason, exit_code)
-        callback(stdout)
+        callback(stdout, exit_code)
     end)
 end
 
+-- run a command and execute a function on its output line by line
+function helpers.line_callback(cmd, callback)
+    return spawn.with_line_callback(cmd, {
+        stdout = function (line)
+            callback(line)
+        end,
+    })
+end
+
 -- }}}
 
 -- {{{ A map utility