X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/e64c1443d028749ba469def533efb075abd3d06b..d99ce8fdba3d86c7837a1ee60c398fa477365eab:/helpers.lua diff --git a/helpers.lua b/helpers.lua index 7c44648..ab87f76 100644 --- a/helpers.lua +++ b/helpers.lua @@ -1,23 +1,18 @@ - --[[ - - Licensed under GNU General Public License v2 - * (c) 2013, Luke Bonham - ---]] + Licensed under GNU General Public License v2 + * (c) 2013, Luke Bonham +--]] + +local spawn = require("awful.spawn") +local timer = require("gears.timer") local debug = require("debug") local io = { lines = io.lines, - open = io.open, - popen = io.popen } + open = io.open } local rawget = rawget local table = { sort = table.sort } -local easy_async = require("awful.spawn").easy_async -local timer = require("gears.timer") -local wibox = require("wibox") - -- Lain helper functions for internal use -- lain.helpers local helpers = {} @@ -110,22 +105,20 @@ end -- {{{ Pipe operations --- return the full output of an input command (synchronous pipe) --- @param cmd the input command --- @return command output (string) -function helpers.read_pipe(cmd) - local f = io.popen(cmd) - local output = f:read("*all") - f:close() - return output -end - -- run a command and execute a function on its output (asynchronous pipe) -- @param cmd the input command -- @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) + 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) end) @@ -177,14 +170,6 @@ function helpers.spairs(t) end end --- create a textbox with no spacing issues -function helpers.make_widget_textbox() - local w = wibox.widget.textbox() - local t = wibox.widget.base.make_widget(w) - t.widget = w - return t -end - -- }}} return helpers