1 files changed, 22 insertions, 27 deletions

diff --git a/aataaj.lua b/aataaj.lua
index 6315982..44ccd5d 100755
--- a/aataaj.lua
+++ b/aataaj.lua
@@ -24,7 +24,7 @@ joysticks it finds as MIDI controllers.  So any ALSA application gets routed thr
 JACK.
 
 This is very rough for now, only just started writing it.  The stop
-command is particularly crude and violent, lots of killall.
+command is particularly crude and violent, lots of pkill.
 
 Since it isn't a package yet, some setup is needed.
 
@@ -190,6 +190,19 @@ APT.exe = function(c)
     return exe
 end
 
+APT.killEmAll = function(all)
+    for i,l in ipairs(all) do
+        local c = 0
+        while 0 ~= tonumber(APT.exe("pgrep -u $USER -xc " .. l):Do().result) do
+            local s = 'TERM'
+            if c > 0 then s = 'KILL' end
+            print(  "pkill -" .. s .. " -u $USER -x " .. l)
+            APT.exe("pkill -" .. s .. " -u $USER -x " .. l):Do()
+            c = c + 1
+        end
+    end
+end
+
 
 
 local args = {...}
@@ -200,17 +213,12 @@ if 0 ~= #args then
 
     if     'start'        == args[1] then
     elseif 'stop'         == args[1] then
-        APT.exe("killall -TERM qsynth"):Do()
+        APT.killEmAll{'qsynth'}
         APT.exe("a2j_control --stop"):Do()
         APT.exe("sleep 2"):Do()
         APT.exe("a2j_control --exit"):Do()
         APT.exe("sleep 2"):Do()
-        APT.exe("killall -TERM alsa_out"):Do()
-        APT.exe("killall -TERM alsa_in"):Do()
-        APT.exe("killall -TERM zita-a2j"):Do()
-        APT.exe("killall -TERM zita-j2a"):Do()
-        APT.exe("killall -TERM aseqjoy"):Do()
-        APT.exe("killall -TERM jack-plumbing"):Do()
+        APT.killEmAll{'alsa_in', 'alsa_out', 'zita-a2j', 'zita-j2a',  'aseqjoy', 'jack-plumbing'}
         APT.exe("sleep 2"):Do()
         APT.exe("jack_control stop"):Do()
         APT.exe("sleep 2"):Do()
@@ -218,25 +226,12 @@ if 0 ~= #args then
         APT.exe("sleep 2"):Do()
         --APT.exe("a2j_control --stop; a2j_control --exit"):Do()
         --APT.exe("sleep 2"):Do()
-        APT.exe("killall -TERM jmcore"):Do()
-        APT.exe("pkill -TERM jackdbus; pkill -TERM a2jmidid"):Do()
-        APT.exe("killall -TERM a2jmidid"):Do()
-        APT.exe("killall -KILL jackdbus"):Do()
-        APT.exe("sleep 2"):Do()
-        APT.exe("killall -KILL a2jmidid"):Do()
-        APT.exe("pkill -KILL jackdbus; pkill -KILL a2jmidid"):Do()
-        APT.exe("sleep 2"):Do()
-        APT.exe("killall -KILL a2jmidid"):Do()
-        APT.exe("killall -KILL jackdbus"):Do()
-        APT.exe("sleep 2"):Do()
-        APT.exe("killall -KILL a2jmidid"):Do()
-        APT.exe("killall -KILL jackdbus"):Do()
-        APT.exe("sleep 2"):Do()
-        APT.exe("pkill -KILL jackdbus; pkill -KILL a2jmidid"):Do()
-        APT.exe("killall -TERM qjackctl"):Do()
-
+        APT.killEmAll{'jmcore', 'qjackctl'}
         -- Catia is python, and no easy way to kill it.
-        APT.exe("ps auxw | grep python"):Do()
+        -- Also it keeps jackdbus alive, no matter how hard you kill it.
+        APT.exe("pkill -TERM -u $USER -f catia"):Do()
+        APT.exe("sleep 2"):Do()
+        APT.killEmAll{'jackdbus', 'a2jmidid'}
         return(0)
     elseif 'JACK'         == args[1] then
     elseif 'restart'      == args[1] then args[1] = 'start'
@@ -564,5 +559,5 @@ elseif 'JACK' == args[1] then
 
     print('Stop our jack-plumbing, eventually.')
     APT.exe('sleep 4'):Do()
-    APT.exe("killall -TERM jack-plumbing"):Do()
+    APT.killEmAll("jack-plumbing"):Do()
 end