Rearrange those logging globals and a few other things in _.

1 files changed, 34 insertions, 43 deletions

diff --git a/_.lua b/_.lua
index 42c3b4a..19b73b4 100755
--- a/_.lua
+++ b/_.lua
@@ -3,21 +3,41 @@
 
 -- Most of this _ stuff was copied from apt-panopticon.
 local _ = {}
-
 _.version = '0.0 crap'
 
-_.D = function(s)       print('DEBUG    ' .. s) end
-_.I = function(s)       print('INFO     ' .. s) end
-_.T = function(s)       print('TIMEOUT  ' .. s) end
-_.W = function(s)       print('WARNING  ' .. s) end
-_.E = function(s)       print('ERROR    ' .. s) end
-_.C = function(s)       print('CRITICAL ' .. s) end
-local D = _.D
-local I = _.I
-local T = _.T
-local W = _.W
-local E = _.E
-local C = _.C
+
+D = function(s) print('DEBUG    ' .. s) end
+I = function(s) print('INFO     ' .. s) end
+T = function(s) print('TIMEOUT  ' .. s) end
+W = function(s) print('WARNING  ' .. s) end
+E = function(s) print('ERROR    ' .. s) end
+C = function(s) print('CRITICAL ' .. s) end
+
+
+_.runnable = function(c)
+    return ( 0 == __('which ' .. c):Do().status )
+end
+
+_.running = function(c)
+        return ( 1 ~= tonumber(__("pgrep -u $USER -cf " .. c):Do().lines[1]) )
+end
+
+_.exists = function(f)
+    local h, e = io.open(f, "r")
+    if nil == h then return false else h:close();  return true end
+end
+
+_.killEmAll = function(all)
+    for i,l in ipairs(all) do
+        local c = 0
+        while 0 ~= tonumber(__("pgrep -u $USER -xc " .. l):Do().lines[1]) do
+            local s = 'TERM'
+            if c > 1 then s = 'KILL'; __("sleep " .. c):Do() end
+            __("pkill -" .. s .. " -u $USER -x " .. l):log():Do()
+            c = c + 1
+        end
+    end
+end
 
 
 _.readCmd = function(cmd)
@@ -33,8 +53,7 @@ _.readCmd = function(cmd)
     return result
 end
 
-
-_._ = function(c)
+__ = function(c)
     local exe = {status = 0, lines = {}, logging = false, showing = false, cmd = '', command = c}
     local n = 0
 
@@ -165,33 +184,5 @@ _._ = function(c)
     return exe
 end
 
-local __ = _._
-
-_.runnable = function(c)
-    return ( 0 == __('which ' .. c):Do().status )
-end
-
-_.running = function(c)
-        return ( 1 ~= tonumber(__("pgrep -u $USER -cf " .. c):Do().lines[1]) )
-end
-
-_.exists = function(f)
-    local h, e = io.open(f, "r")
-    if nil == h then return false else h:close();  return true end
-end
-
-_.killEmAll = function(all)
-    for i,l in ipairs(all) do
-        local c = 0
-        while 0 ~= tonumber(__("pgrep -u $USER -xc " .. l):Do().lines[1]) do
-            local s = 'TERM'
-            if c > 1 then s = 'KILL'; __("sleep " .. c):Do() end
-            __("pkill -" .. s .. " -u $USER -x " .. l):log():Do()
-            c = c + 1
-        end
-    end
-end
-
-
 
 return _