inotifywatch: New completion, common with inotifywait

completions/.gitignore

@@ -83,6 +83,7 @@ ifdown
 ifquery
 ifstatus
 import
+inotifywatch
 insmod.static
 iperf3
 javac

completions/Makefile.am

@@ -566,6 +566,7 @@ CLEANFILES = \
 	ifquery \
 	ifstatus \
 	import \
+	inotifywatch \
 	insmod.static \
 	iperf3 \
 	javac \
@@ -866,6 +867,10 @@ symlinks: $(targetdir) $(DATA)
 		rm -f $(targetdir)/$$file && \
 			$(LN_S) info $(targetdir)/$$file ; \
 	done
+	for file in inotifywatch ; do \
+		rm -f $(targetdir)/$$file && \
+			$(LN_S) inotifywait $(targetdir)/$$file ; \
+	done
 	for file in insmod.static ; do \
 		rm -f $(targetdir)/$$file && \
 			$(LN_S) insmod $(targetdir)/$$file ; \

completions/inotifywait

@@ -1,4 +1,15 @@
-# bash completion for inotifywait(1)                       -*- shell-script -*-
+# bash completion for inotifywait(1) and inotifywatch(1)   -*- shell-script -*-
+
+_inotifywait_events()
+{
+    # Expecting line with "Events:", followed by ones starting with one
+    # tab. Word following the tab is event name, others are line
+    # wrapped explanations.
+    COMPREPLY+=( $( compgen -W "$( $1 --help 2>/dev/null | \
+        sed -e '/^Events:/,/^[^'$'\t'']/!d' \
+           -ne 's/^'$'\t''\([^ '$'\t'']\{1,\}\)[ '$'\t''].*/\1/p' )" \
+        -- "$cur" ) )
+}
 
 _inotifywait()
 {
@@ -14,13 +25,12 @@ _inotifywait()
             return
             ;;
         --event|-!(-*)e)
-            # Expecting line with "Events:", followed by ones starting with one
-            # tab. Word following the tab is event name, others are line
-            # wrapped explanations.
-            COMPREPLY=( $( compgen -W "$( $1 --help 2>/dev/null | \
-                sed -e '/^Events:/,/^[^'$'\t'']/!d' \
-                   -ne 's/^'$'\t''\([^ '$'\t'']\{1,\}\)[ '$'\t''].*/\1/p' )" \
-                -- "$cur" ) )
+            _inotifywait_events "$1"
+            return
+            ;;
+        --ascending|--descending)
+            COMPREPLY=( $( compgen -W 'total' -- "$cur" ) )
+            _inotifywait_events "$1"
             return
             ;;
     esac
@@ -32,6 +42,6 @@ _inotifywait()
 
     _filedir
 } &&
-complete -F _inotifywait inotifywait
+complete -F _inotifywait inotifywait inotifywatch
 
 # ex: filetype=sh

test/t/Makefile.am

@@ -233,6 +233,7 @@ EXTRA_DIST = \
 	test_info.py \
 	test_inject.py \
 	test_inotifywait.py \
+	test_inotifywatch.py \
 	test_insmod.py \
 	test_installpkg.py \
 	test_interdiff.py \

test/t/test_inotifywatch.py

@@ -0,0 +1,16 @@
+import pytest
+
+
+class TestInotifywatch:
+
+    @pytest.mark.complete("inotifywatch ")
+    def test_1(self, completion):
+        assert completion.list
+
+    @pytest.mark.complete("inotifywatch --")
+    def test_2(self, completion):
+        assert completion.list
+
+    @pytest.mark.complete("inotifywatch -e ")
+    def test_3(self, completion):
+        assert len(completion.list) > 1