Browse Source

Fixes for behaviour of os.execute in lua versions >5.1

master
Yessiest 2 years ago
parent
commit
ca613ba0ed
  1. BIN
      libs/pam.so
  2. 15
      libs/thumbnail.lua
  3. 12
      modules/awesomerc.lua

BIN
libs/pam.so

15
libs/thumbnail.lua

@ -1,17 +1,26 @@
-- A small utility function to generate thumbnails for images
local spawn = require("awful.spawn")
local thumbnailer = {}
-- annoying shit but that's what happens
if _VERSION ~= "Lua 5.1" then
execute = function(comm)
return select(3,os.execute(comm))
end
else
execute = os.execute
end
thumbnailer.generate = function(path,thumb_path,height)
assert(type(path) == "string", "argumenr #1 (path) is not a string")
assert(type(thumb_path) == "string", "argument #2 (thumbnail path) is not a string")
assert(type(height) == "number","argument #3 (height) is not a number")
if os.execute("ls "..path) ~= 0 then
require("naughty").notify({text = tostring(path).." "..tostring(thumb_path.." ")..tostring(height)})
if execute("ls "..path) ~= 0 then
return false, "unable to access image directory"
end
if os.execute("ls "..thumb_path) == 0 then
if execute("ls "..thumb_path) == 0 then
return true
end
if os.execute("mkdir "..thumb_path) ~= 0 then
if execute("mkdir "..thumb_path) ~= 0 then
return false, "unable to create thumbnail directory"
end
spawn("mogrify -thumbnail x"..tostring(height).." -path '"..thumb_path.."' '"..path.."'/*.{jpg,png}")

12
modules/awesomerc.lua

@ -3,6 +3,16 @@
-- It's like cron's @reboot but with additional awesomewm specific features
local awful = require("awful")
local rcfile = io.open(global.config_dir.."rc.lua")
local execute
-- why thank you lua changes, i appreciate this shit.
-- (luajit is deprecated my ASS, find me a faster version then)
if _VERSION ~= "Lua 5.1" then
execute = function(comm)
return select(3,os.execute(comm))
end
else
execute = os.execute
end
local execd = {}
-- load persistent file for "o" tag
local execd_file = io.open("/tmp/awesomerc.started","r")
@ -25,7 +35,7 @@ local function check_pid(prg)
break
end
end
if os.execute("pgrep "..prgname) == 0 then
if execute("pgrep "..prgname) == 0 then
return true
else
return false

Loading…
Cancel
Save