1 files changed, 10 insertions, 36 deletions
diff --git a/ioslay-firefox b/ioslay-firefox
index fb382e0..5041260 100755
--- a/ioslay-firefox
+++ b/ioslay-firefox
@@ -69,40 +69,14 @@ iotop_reader()
    done
 }
-if [ "$UID" != 0 ]
+sudo_iotop()
-then
+{
-    sudo -- "$0" "$@"
+    if [ "$UID" = 0 ]
-    exit
+    then
-fi
+        command iotop "$@"
+    else
-while [ $# -gt 0 ]
+        sudo iotop "$@"
-do
+    fi
-    case "$1" in
+}
-        -q | --quiet )
-            exec 2>/dev/null
-            shift
-            ;;
-        -a | --all )
-            IOSLAY_KILL_ALL=y
-            shift
-            ;;
-        -- )
-            shift
-            break
-            ;;
-        -* )
-            exit 1
-            ;;
-        * )
-            break
-            ;;
-    esac
-done
-# if [ $# -gt 0 ]
-# then
-#     echo "$0: Error: usage" >&2
-#     exit 1
-# fi
-iotop -qq -b $(printf '\55\55pid=%s\n' "$@") | iotop_reader
+sudo_iotop -qq -b $(printf '\55\55pid=%s\n' "$@") | iotop_reader

diff --git a/ioslay-firefox b/ioslay-firefox index fb382e0..5041260 100755 --- a/ioslay-firefox +++ b/ioslay-firefox
@@ -69,40 +69,14 @@ iotop_reader()
69	done	69	done
70	}	70	}
71		71
72	if [ "$UID" != 0 ]	72	sudo_iotop()
73	then	73	{
74	sudo -- "$0" "$@"	74	if [ "$UID" = 0 ]
75	exit	75	then
76	fi	76	command iotop "$@"
77		77	else
78	while [ $# -gt 0 ]	78	sudo iotop "$@"
79	do	79	fi
80	case "$1" in	80	}
81	-q \| --quiet )
82	exec 2>/dev/null
83	shift
84	;;
85	-a \| --all )
86	IOSLAY_KILL_ALL=y
87	shift
88	;;
89	-- )
90	shift
91	break
92	;;
93	-* )
94	exit 1
95	;;
96	* )
97	break
98	;;
99	esac
100	done
101
102	# if [ $# -gt 0 ]
103	# then
104	# echo "$0: Error: usage" >&2
105	# exit 1
106	# fi
107		81
108	iotop -qq -b $(printf '\55\55pid=%s\n' "$@") \| iotop_reader	82	sudo_iotop -qq -b $(printf '\55\55pid=%s\n' "$@") \| iotop_reader