cleanup

3 files changed, 19 insertions, 73 deletions

diff --git a/fireslay b/fireslay
index 892dbee..3c68ad5 100755
--- a/fireslay
+++ b/fireslay
@@ -2,69 +2,6 @@
 set -e
 . sliceweasel.lib.sh
 
-die()
-{
-    printf '%s: Error: %s\n' "$0" "$*" >&2
-    exit 1
-}
-
-parseopts()
-{
-    while [ $# -gt 0 ]
-    do
-        case "$1" in
-            -q | --quiet )
-                exec 2>/dev/null
-                ;;
-            -y | --kill-last-process )
-                FIRESLAY_KILL_LAST_PROCESS=y
-                ;;
-            --)
-                shift
-                break
-                ;;
-            -* )
-                die unknown option
-                ;;
-            *)
-                break
-                ;;
-        esac
-        shift
-    done
-    [ $# = 0 ] || die usage
-}
-
-main()
-{
-    parseopts "$@"
-
-    set -- $(web_content_pids)
-
-    (
-        case $# in
-            0 ) echo "$0: Warning: Not slaying: no Web Content process found." >&2
-                exit
-                ;;
-            1 ) if ! [ "$FIRESLAY_KILL_LAST_PROCESS" ]
-                then
-                    echo "$0: Warning: Not slaying: only one 'Web Content' process.  Specify -y to kill it." >&2
-                    exit
-                fi
-                ;;
-            * ) shift
-                ;;
-        esac
-        set -x
-        ps $* >&2 &
-        kill $*
-    )
-
-    r=$?
-    ps $* >&2
-    exit $r
-}
-
 is_web_content()
 {
     local comm state
@@ -84,10 +21,18 @@ web_content_pids()
 }
 
 FIREFOX_GROUP_PROCS=$(get_firefox_cgroup_procs)
-if [ -e "$FIREFOX_GROUP_PROCS" ]
+
+[ -e "$FIREFOX_GROUP_PROCS" ] || die "Firefox group not found ($FIREFOX_GROUP_PROCS)"
+
+set -- $(web_content_pids)
+
+if [ $# = 0 ]
 then
-    main "$@"
-else
-    echo "Error: Firefox group not found ($FIREFOX_GROUP_PROCS)" >&2
+    exit
 fi
 
+(
+    set -x
+    ps $* >&2
+    kill $*
+)
diff --git a/ioslay-firefox b/ioslay-firefox
index 5041260..40fbd7e 100755
--- a/ioslay-firefox
+++ b/ioslay-firefox
@@ -21,8 +21,6 @@ last()
     printf '%s\n' "$*"
 }
 
-enable -f /usr/lib/bash/sleep sleep 2>/dev/null || true
-
 iotop_reader()
 {
     log=
@@ -42,10 +40,7 @@ iotop_reader()
                     if [ "$(sum $log)" -gt 4 ]
                     then
                         log= # this is year zero; all past history is erased.
-                        (
-                            set -x
-                            fireslay -y
-                        )
+                        fireslay
                     fi
                 else
                     log=$(last 10 $log 0)
diff --git a/sliceweasel.lib.sh b/sliceweasel.lib.sh
index d9a93c5..549e1e8 100755
--- a/sliceweasel.lib.sh
+++ b/sliceweasel.lib.sh
@@ -1,4 +1,10 @@
 #!/bin/sh
+die()
+{
+    printf '%s: Error: %s\n' "$0" "$*" >&2
+    exit 1
+}
+
 get_age()
 {
     local mtime now