chsh, pwck: try _parse_help before _parse_usage

scop · May 8, 2019 · 696f90d · 696f90d
1 parent 06cea18
commit 696f90d
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/completions/_chsh b/completions/_chsh
@@ -19,7 +19,8 @@ _chsh()
     esac
 
     if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1")' -- "$cur") )
+        local opts=$(_parse_help "$1")
+        COMPREPLY=( $(compgen -W '${opts:-$(_parse_usage "$1")}' -- "$cur") )
     else
         _allowed_users
     fi

diff --git a/completions/pwck b/completions/pwck
@@ -6,7 +6,8 @@ _pwck()
     _init_completion || return
 
     if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1")' -- "$cur") )
+        local opts=$(_parse_help "$1")
+        COMPREPLY=( $(compgen -W '${opts:-$(_parse_usage "$1")}' -- "$cur") )
         return
     fi
 

diff --git a/test/t/test_chsh.py b/test/t/test_chsh.py
@@ -9,3 +9,7 @@ def test_1(self, completion):
     @pytest.mark.complete("chsh -s ")
     def test_2(self, completion):
         assert completion
+
+    @pytest.mark.complete("chsh -")
+    def test_3(self, completion):
+        assert completion
diff --git a/test/t/test_pwck.py b/test/t/test_pwck.py
@@ -5,3 +5,7 @@ class TestPwck:
     @pytest.mark.complete("pwck ")
     def test_1(self, completion):
         assert completion
+
+    @pytest.mark.complete("pwck -")
+    def test_2(self, completion):
+        assert completion