1 files changed, 11 insertions, 56 deletions

diff --git a/ioslay-mgr.sh b/ioslay-mgr.sh
index 85ff4d7..423aa5e 100755
--- a/ioslay-mgr.sh
+++ b/ioslay-mgr.sh
@@ -1,58 +1,6 @@
 #!/bin/bash
 
-ioslay=
-each_new_process()
-{
-    while read pid _
-    do
-        read -N 10001000 procs < /sys/fs/cgroup/$group/cgroup.procs
-        set -- $procs
-
-        for pid in "$@"
-        do
-            if read comm < /proc/$pid/comm && [ "$comm" = 'Web Content' ]
-            then
-                set -- "$@" "$1"
-            fi
-            shift
-        done
-
-        if [ "$ioslay" ]
-        then
-            children=$(pgrep -P $ioslay)
-            if [ "$children" ]
-            then
-                kill $children
-            fi
-            wait $ioslay
-        fi
-
-        if [ $# -gt 0 ]
-        then
-            ioslay-firefox "$@" &
-            ioslay=$!
-        fi
-    done
-}
-
-get_uid()
-{
-    (
-        if [ "$SUDO_USER" ]
-        then
-            IFS=:
-            set -- $(getent passwd "${SUDO_USER}") || return
-            echo $3
-        else
-            id -un
-        fi
-    )
-}
-
-#cgroup-show-each-new-process "$group" | grep --line-buffered 'Web Content' | each_new_process
-
-# Really, could just check for any/first cgroup with processes and basename
-# 'firefox'.  Fork for each one.
+. sliceweasel.lib.sh
 
 vkill()
 {
@@ -61,9 +9,13 @@ vkill()
         return
     fi
     (
+        if [ "$(id -u)" = 0 ]
+        then sudo=
+        else sudo=sudo
+        fi
         set -x
         ps u "$@"
-        sudo kill "$@"
+        $sudo kill "$@"
     )
 }
 
@@ -77,8 +29,11 @@ slay_slayer()
     fi
 }
 
+GROUP_BASENAME=firefox
+
+uid=$(set -x; get_uid)
 uid=1000
-group=user.slice/user-$uid.slice/firefox
+group=user.slice/user-$uid.slice/$GROUP_BASENAME
 group_procs=/sys/fs/cgroup/$group/cgroup.procs
 wantcomm='Web Content'
 ioslay=
@@ -105,7 +60,7 @@ do
         then
             slay_slayer
             wait $ioslay
-            sudo ioslay-firefox "$@" &
+            ioslay-firefox "$@" &
             ioslay=$!
         fi
         lastargs=$*