pidof: Don't check OS type (Alioth #311403)

Also drop non-existent option arguments completion.

Reviewed-by: Ville Skyttä <ville.skytta@iki.fi>

completions/.gitignore

@@ -94,7 +94,6 @@ pbzip2
 pccardctl
 perldoc
 phing
-pidof
 pigz
 pinfo
 ping6

completions/Makefile.am

@@ -210,6 +210,7 @@ bashcomp_DATA = a2x \
 		passwd \
 		perl \
 		pgrep \
+		pidof \
 		pine \
 		ping \
 		pkg-config \
@@ -425,7 +426,6 @@ CLEANFILES = \
 	pccardctl \
 	perldoc \
 	phing \
-	pidof \
 	pigz \
 	pinfo \
 	ping6 \
@@ -683,10 +683,6 @@ symlinks:
 		rm -f $(targetdir)/$$file && \
 			$(LN_S) perl $(targetdir)/$$file ; \
 	done
-	for file in pidof ; do \
-		rm -f $(targetdir)/$$file && \
-			$(LN_S) pgrep $(targetdir)/$$file ; \
-	done
 	for file in alpine ; do \
 		rm -f $(targetdir)/$$file && \
 			$(LN_S) pine $(targetdir)/$$file ; \

completions/pgrep

@@ -32,7 +32,4 @@ _pgrep()
 } &&
 complete -F _pgrep pgrep
 
-# Linux pidof(8) completion.
-[[ $OSTYPE == *linux* ]] && complete -F _pgrep pidof
-
 # ex: ts=4 sw=4 et filetype=sh

completions/pidof

@@ -0,0 +1,19 @@
+# pidof(8) completion                                      -*- shell-script -*-
+
+_pidof()
+{
+    local cur prev words cword
+    _init_completion || return
+
+    case $prev in
+        -o)
+            _pids
+            return
+            ;;
+    esac
+
+    _pnames
+} &&
+complete -F _pidof pidof
+
+# ex: ts=4 sw=4 et filetype=sh

test/completion/pidof.exp

@@ -0,0 +1 @@
+assert_source_completions pidof

test/lib/completions/pidof.exp

@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "pidof "
+
+
+sync_after_int
+
+
+teardown