Merge pull request #61 from rical/master

tipc: fix some minor errors

Author: scop

completions/tipc

@@ -40,7 +40,7 @@ _tipc_bearer() {
     elif [[ $cword -eq $optind+3 ]]; then
         case "$media" in
         "udp")
-            local names=$(tipc bearer list | awk -F: '/^udp:/ {print $2}')
+            local names=$(tipc bearer list 2>/dev/null | awk -F: '/^udp:/ {print $2}')
             COMPREPLY=( $( compgen -W '$names' -- $cur) )
             ;;
         "eth")
@@ -63,7 +63,8 @@ _tipc_link() {
         COMPREPLY=( $( compgen -W 'link' -- $cur) )
     elif [[ $cword -eq $optind+1 ]]; then
         # awk drops link state and last trailing :
-        local links=$(tipc link list | awk '{print substr($1, 0, length($1)-1)}')
+        local links=$(tipc link list 2>/dev/null | \
+                      awk '{print substr($1, 0, length($1))}')
         if [[ $filter == "peers" ]]; then
             links=$(command sed '/broadcast-link/d' <<<"$links")
         fi
@@ -87,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
@@ -138,13 +149,11 @@ _tipc()
             done
 
             COMPREPLY=( $( compgen -W '${params[@]}' -- $cur) )
-            return
             ;;
         disable)
             let optind++
 
             _tipc_bearer $optind
-            return
             ;;
         get)
             let optind++
@@ -154,7 +163,6 @@ _tipc()
             elif [[ $cword -ge $optind+1 ]]; then
                 _tipc_bearer $(($optind + 1))
             fi
-            return
             ;;
         set)
             let optind++
@@ -164,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++
@@ -186,7 +192,6 @@ _tipc()
             elif [[ $cword -ge $optind+1 ]]; then
                 _tipc_link $(($optind + 1)) "peers"
             fi
-            return
             ;;
         set)
             let optind++
@@ -196,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++
@@ -231,7 +235,6 @@ _tipc()
             elif [[ $cword -ge $optind+1 ]]; then
                 _tipc_media $(($optind + 1))
             fi
-            return
             ;;
         set)
             let optind++
@@ -241,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