Merge pull request #173 from guotsuan/master

To be compatible with the new functions in master branch of the awesome WM master

asyncshell.lua

@@ -52,7 +52,11 @@ function asyncshell.request(command, callback, timeout)
         id, formatted_command
     )
 
+    if type(awful.spawn) == 'table' then
+        awful.spawn.with_shell(req)
+    else
         awful.util.spawn_with_shell(req)
+    end
 
     if timeout then
         asyncshell.request_table[id].timer = timer({ timeout = timeout })

helpers.lua

@@ -8,7 +8,7 @@
 
 local debug  = require("debug")
 
-local capi   = { timer = timer }
+local capi   = { timer = (type(timer) == 'table' and timer or require ("gears.timer")) }
 local io     = { open  = io.open,
                  lines = io.lines,
                  popen = io.popen }