tipc: handle complete words without trailing space

Prior to this commit,
$ tipc socke<TAB>
$ tipc socket <TAB>
Both produced "tipc socket " while

While
$ tipc socket<TAB>
didn't produce anything. This was true for almost all commands and was
a result of the recipe design. The mechanism that hinder repetition
didn't handle complete words without a trailing space.

In this patch we fix this, so that pressing tab after a completed
valid subcommand inserts a space.

Fixes #60

Author: Richard Alpe

completions/tipc

@@ -88,10 +88,20 @@ _tipc()
         ;;
     esac
 
+	if [[ $cword -eq 1 ]]; then
+		COMPREPLY=( $( compgen -W 'bearer link media nametable node socket' -- $cur ) )
+		return
+	fi
+
     case "${words[$optind]}" in
     bearer)
         let optind++
 
+        if [[ $cword -eq $optind ]]; then
+            COMPREPLY=( $( compgen -W 'enable disable set get list' -- $cur ) )
+            return
+        fi
+
         case "${words[$optind]}" in
         enable)
             local media params
@@ -139,13 +149,11 @@ _tipc()
             done
 
             COMPREPLY=( $( compgen -W '${params[@]}' -- $cur) )
-            return
             ;;
         disable)
             let optind++
 
             _tipc_bearer $optind
-            return
             ;;
         get)
             let optind++
@@ -155,7 +163,6 @@ _tipc()
             elif [[ $cword -ge $optind+1 ]]; then
                 _tipc_bearer $(($optind + 1))
             fi
-            return
             ;;
         set)
             let optind++
@@ -165,19 +172,17 @@ _tipc()
             elif [[ $cword -ge $optind+2 ]]; then
                 _tipc_bearer $(($optind + 2))
             fi
-            return
-            ;;
-        list)
-            return
             ;;
         esac
-
-        COMPREPLY=( $( compgen -W 'enable disable set get list' -- $cur ) )
-        return
         ;;
     link)
         let optind++
 
+        if [[ $cword -eq $optind ]]; then
+            COMPREPLY=( $( compgen -W 'get set list statistics'  -- $cur ) )
+            return
+        fi
+
         case "${words[$optind]}" in
         get)
             let optind++
@@ -187,7 +192,6 @@ _tipc()
             elif [[ $cword -ge $optind+1 ]]; then
                 _tipc_link $(($optind + 1)) "peers"
             fi
-            return
             ;;
         set)
             let optind++
@@ -197,32 +201,31 @@ _tipc()
             elif [[ $cword -ge $optind+2 ]]; then
                 _tipc_link $(($optind + 2)) "peers"
             fi
-            return
-            ;;
-        list)
-            return
             ;;
         statistics)
             let optind++
 
+            if [[ $cword -eq $optind ]]; then
+                COMPREPLY=( $( compgen -W 'show reset' -- $cur) )
+                return
+            fi
+
             case "${words[$optind]}" in
             show|reset)
                 _tipc_link $(($optind + 1))
-                return
                 ;;
             esac
-
-            COMPREPLY=( $( compgen -W 'show reset' -- $cur) )
-            return
             ;;
         esac
-
-        COMPREPLY=( $( compgen -W 'get set list statistics'  -- $cur ) )
-        return
         ;;
     media)
         let optind++
 
+        if [[ $cword -eq $optind ]]; then
+            COMPREPLY=( $( compgen -W 'get set list'  -- $cur ) )
+            return
+        fi
+
         case "${words[$optind]}" in
         get)
             let optind++
@@ -232,7 +235,6 @@ _tipc()
             elif [[ $cword -ge $optind+1 ]]; then
                 _tipc_media $(($optind + 1))
             fi
-            return
             ;;
         set)
             let optind++
@@ -242,66 +244,41 @@ _tipc()
             elif [[ $cword -ge $optind+2 ]]; then
                 _tipc_media $(($optind + 2))
             fi
-            return
-            ;;
-        list)
-            return
             ;;
         esac
-
-        COMPREPLY=( $( compgen -W 'get set list'  -- $cur ) )
-        return
         ;;
     nametable)
         let optind++
 
-        case "${words[$optind]}" in
-        show)
-            return
-            ;;
-        esac
-
-        COMPREPLY=( $( compgen -W 'show'  -- $cur ) )
-        return
+        if [[ $cword -eq $optind ]]; then
+            COMPREPLY=( $( compgen -W 'show'  -- $cur ) )
+        fi
         ;;
     node)
         let optind++
 
+        if [[ $cword -eq $optind ]]; then
+            COMPREPLY=( $( compgen -W 'list get set'  -- $cur ) )
+            return
+        fi
+
         case "${words[$optind]}" in
         get|set)
             let optind++
 
-            case "${words[$optind]}" in
-            address|netid)
-                return
-                ;;
-            esac
-            COMPREPLY=( $( compgen -W 'address netid'  -- $cur ) )
-            return
-            ;;
-        list)
-            return
-            ;;
+            if [[ $cword -eq $optind ]]; then
+                COMPREPLY=( $( compgen -W 'address netid'  -- $cur ) )
+            fi
         esac
-
-        COMPREPLY=( $( compgen -W 'list get set'  -- $cur ) )
-        return
         ;;
     socket)
         let optind++
 
-        case "${words[$optind]}" in
-        list)
-            return
-            ;;
-        esac
-
-        COMPREPLY=( $( compgen -W 'list'  -- $cur ) )
-        return
+        if [[ $cword -eq $optind ]]; then
+            COMPREPLY=( $( compgen -W 'list'  -- $cur ) )
+        fi
         ;;
     esac
-
-    COMPREPLY=( $( compgen -W 'bearer link media nametable node socket' -- $cur ) )
 }
 complete -F _tipc tipc