Clean up debug

common-constants.lua

@@ -1,19 +1,9 @@
--- luacheck: globals CONKY_DEBUG
 local COMMON_NAME = "org.awesomewm"
 local CONKY_NAME = COMMON_NAME .. ".conky"
 local AWESOME_NAME = COMMON_NAME .. ".awful"
 
-local HOME = os.getenv("HOME")
-
-local CONKY_LAUNCH = HOME .. "/.config/awesome/conky/conky-awesome-launch"
-
-if CONKY_DEBUG then
- CONKY_NAME = "org.awesomewm.test.conky"
- CONKY_LAUNCH = CONKY_LAUNCH .. " --debug"
-end
-
 local constants = {
- CONKY_LAUNCH = CONKY_LAUNCH,
+ CONKY_LAUNCH = "conky",
  DELIMITER = "", -- <C-D>
  DBUS_PATH = "/",
  CONKY_NAME = CONKY_NAME,

conky-dbus.lua

@@ -1,4 +1,6 @@
 
+package.path = os.getenv("HOME") .. "/.config/awesome/conky/?.lua;" .. package.path
+
 if os.getenv("CONKY_DEBUG") == "true" then
  print("conky-dbus running in debug mode")
  rawset(_G, "CONKY_DEBUG", true)
@@ -14,7 +16,6 @@ local previous_request = 0
 function conky_update_awesome() -- luacheck: ignore
  conky_string = listen() or conky_string
 
-
  if conky_string then
  send(conky_parse(conky_string))
  elseif os.time() > previous_request + 10 then

dbus-common.lua

@@ -1,27 +1,19 @@
 -- INIT -- {{{1
 
+-- luacheck: globals CONKY_DEBUG
 local ldbus = require("ldbus")
 local CONST = require("common-constants")
 local dbus = {}
 
-local fnoop = function() end
-
--- TODO: some actual error handling
-
 function dbus.setup(name) -- {{{1
  -- returns a set of functions,
  -- one for emitting signals, and one for checking for them
- --
- -- NOTE: including this module returns this function
  if not (name == "conky" or name == "awesome") then
  print("Must be conky or awesome, got:", name)
  return
  end
 
  local conn = assert(ldbus.bus.get("session"))
- --if not pcall(dbus.request_name(conn, name)) then
- --return fnoop, fnoop, fnoop
- --end
  dbus.request_name(conn, name)
 
  if name == "conky" then
@@ -36,7 +28,6 @@ end
 
 function dbus.listener_for(conn, signal_type) -- {{{1
  -- returns a function that checks if the specified signal has been emitted
- --local conn = conn
  if CONKY_DEBUG then
  print("setting up listener for signal: " .. signal_type)
  end
@@ -56,8 +47,6 @@ end
 
 function dbus.emitter_for(conn, signal_type, member) -- {{{1
  -- returns a function that emits the specified signal
- --local conn = conn
- --local signal_type = signal_type
  local last_message = nil
 
  if CONKY_DEBUG then

dbus-send

@@ -1,8 +1,4 @@
 #!/usr/bin/env lua
-if arg[1] == "debug" then
- rawset(_G, "CONKY_DEBUG", true)
- table.remove(arg, 1)
-end
 
 print(require("common-constants")("CONKY_NAME"))
 

monitor

@@ -1,7 +1,4 @@
 #!/usr/bin/env lua
-if arg[1] == "debug" then
- rawset(_G, "CONKY_DEBUG", true)
-end
 
 local CONST = require("common-constants")
 
@@ -41,8 +38,7 @@ local awk = table.concat({
 
 local cmd = mon .. " | " .. awk
 
--- luacheck: globals CONKY_DEBUG
-if CONKY_DEBUG then
+if arg[1] == "-v" then
  print("running with command:")
  print(cmd)
 end