Merge pull request #256 from wimstefan/master

[etc/awesome.git] / asyncshell.lua

diff --git a/asyncshell.lua b/asyncshell.lua
index 827cf4be4b0f500174ba2279429039d5f39516aa..61336db5920ba705e94d4d746e637ff4e62805fd 100644 (file)
--- a/asyncshell.lua
+++ b/asyncshell.lua
@@ -14,6 +14,9 @@
 -- Grab environment
 local awful = require('awful')
 
+-- Avoid discrepancies across multiple shells
+awful.util.shell = '/bin/sh'
+
 -- Initialize tables for module
 asyncshell = { request_table = {}, id_counter = 0 }
 
@@ -49,7 +52,11 @@ function asyncshell.request(command, callback, timeout)
         id, formatted_command
     )
 
-    awful.util.spawn_with_shell(req)
+    if type(awful.spawn) == 'table' and awful.spawn.with_shell 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 })