awesome: replace awful.util.spawn with awful.spawn

diff --git a/awesome/bindings.lua b/awesome/bindings.lua
index a482d3628114baae7221e0924e7bbfcd32b92519..16d579af6558d36c1a1f216f6cd4429dca783c04 100644 (file)
--- a/awesome/bindings.lua
+++ b/awesome/bindings.lua
@@ -121,25 +121,25 @@ globalkeys = awful.util.table.join(globalkeys,
 
     -- Applications {{{2
     -- Ksnapshot
 
     -- Applications {{{2
     -- Ksnapshot

-    awful.key({        }, "F13",   function () awful.util.spawn("ksnapshot") end),
-    awful.key({        }, "Print", function () awful.util.spawn("ksnapshot") end),
+    awful.key({        }, "F13",   function () awful.spawn("ksnapshot") end),
+    awful.key({        }, "Print", function () awful.spawn("ksnapshot") end),

     -- ranger
     -- ranger

-    awful.key({ modkey }, "r", function () awful.util.spawn(terminal .. " -e ranger") end),
+    awful.key({ modkey }, "r", function () awful.spawn(terminal .. " -e ranger") end),

     -- Volume
     -- Volume

-    awful.key({        }, "XF86AudioMute",        function () awful.util.spawn("ponymix toggle")     end,
+    awful.key({        }, "XF86AudioMute",        function () awful.spawn("ponymix toggle")     end,

               {description = "toggle mute", group = "volume"}),
               {description = "toggle mute", group = "volume"}),

-    awful.key({        }, "XF86AudioLowerVolume", function () awful.util.spawn("ponymix decrease 5") end,
+    awful.key({        }, "XF86AudioLowerVolume", function () awful.spawn("ponymix decrease 5") end,

               {description = "decrease volume", group = "volume"}),
               {description = "decrease volume", group = "volume"}),

-    awful.key({        }, "XF86AudioRaiseVolume", function () awful.util.spawn("ponymix increase 5") end,
+    awful.key({        }, "XF86AudioRaiseVolume", function () awful.spawn("ponymix increase 5") end,

               {description = "increase volume", group = "volume"}),
               {description = "increase volume", group = "volume"}),

-    awful.key({ modkey }, "F10",                  function () awful.util.spawn("ponymix toggle")     end,
+    awful.key({ modkey }, "F10",                  function () awful.spawn("ponymix toggle")     end,

               {description = "toggle mute", group = "volume"}),
               {description = "toggle mute", group = "volume"}),

-    awful.key({ modkey }, "F11",                  function () awful.util.spawn("ponymix decrease 5") end,
+    awful.key({ modkey }, "F11",                  function () awful.spawn("ponymix decrease 5") end,

               {description = "decrease volume", group = "volume"}),
               {description = "decrease volume", group = "volume"}),

-    awful.key({ modkey }, "F12",                  function () awful.util.spawn("ponymix increase 5") end,
+    awful.key({ modkey }, "F12",                  function () awful.spawn("ponymix increase 5") end,

               {description = "increase volume", group = "volume"}),
     -- Lock
               {description = "increase volume", group = "volume"}),
     -- Lock

-    awful.key({ modkey, "Control" }, "Escape", function () awful.util.spawn("xautolock -locknow") end),
+    awful.key({ modkey, "Control" }, "Escape", function () awful.spawn("xautolock -locknow") end),

     -- VimWiki
     awful.key({ modkey }, "i", function ()
         awful.spawn(terminal.." -name vimwiki -e vim -c 'call vimwiki#base#goto_index(v:count1)'")
     -- VimWiki
     awful.key({ modkey }, "i", function ()
         awful.spawn(terminal.." -name vimwiki -e vim -c 'call vimwiki#base#goto_index(v:count1)'")

diff --git a/awesome/utils.lua b/awesome/utils.lua
index 0f12be1aab2c6ba50fd5ae8d5efb339c7449c9b0..070cb3ea51c1678dba196709675a80436f16247e 100644 (file)
--- a/awesome/utils.lua
+++ b/awesome/utils.lua
@@ -47,7 +47,7 @@ function utils.run_or_kill(prg, cprop, screen)
             end
         end
     end
             end
         end
     end

-    awful.util.spawn_with_shell(prg, screen)
+    awful.spawn.with_shell(prg, screen)

 end
 
 -- http://awesome.naquadah.org/wiki/Autostart#Simple_way
 end
 
 -- http://awesome.naquadah.org/wiki/Autostart#Simple_way


@@ -61,9 +61,9 @@ function utils.run_once(prg,arg_string,pname,screen)
     end
 
     if not arg_string then
     end
 
     if not arg_string then

-        awful.util.spawn_with_shell("pgrep -f -u $USER -x '" .. pname .. "' || (" .. prg .. ")",screen)
+        awful.spawn.with_shell("pgrep -f -u $USER -x '" .. pname .. "' || (" .. prg .. ")",screen)

     else
     else

-        awful.util.spawn_with_shell("pgrep -f -u $USER -x '" .. pname .. " ".. arg_string .."' || (" .. prg .. " " .. arg_string .. ")",screen)
+        awful.spawn.with_shell("pgrep -f -u $USER -x '" .. pname .. " ".. arg_string .."' || (" .. prg .. " " .. arg_string .. ")",screen)

     end
 end
 
     end
 end