Commit a8d7141d authored by Brad King's avatar Brad King
Browse files

bash-completion: Future-proof --help-*-list "cXXXX version" filtering

A future version of CMake may not print the "cmake version" line at the
beginning of the --help-*-list output.  Filter out the line with 'grep'
instead of 'tail' to tolerate output from versions of CMake with and
without the version line.  Match "cmake version", "cpack version", and
"ctest version" in each corresponding completion script.
parent 4c4bafde
...@@ -111,12 +111,12 @@ _cmake() ...@@ -111,12 +111,12 @@ _cmake()
;; ;;
--help-command) --help-command)
COMPREPLY=( $( compgen -W '$( cmake --help-command-list 2>/dev/null| COMPREPLY=( $( compgen -W '$( cmake --help-command-list 2>/dev/null|
tail -n +2 )' -- "$cur" ) ) grep -v "^cmake version " )' -- "$cur" ) )
return return
;; ;;
--help-module) --help-module)
COMPREPLY=( $( compgen -W '$( cmake --help-module-list 2>/dev/null| COMPREPLY=( $( compgen -W '$( cmake --help-module-list 2>/dev/null|
tail -n +2 )' -- "$cur" ) ) grep -v "^cmake version " )' -- "$cur" ) )
return return
;; ;;
--help-policy) --help-policy)
...@@ -126,12 +126,12 @@ _cmake() ...@@ -126,12 +126,12 @@ _cmake()
;; ;;
--help-property) --help-property)
COMPREPLY=( $( compgen -W '$( cmake --help-property-list \ COMPREPLY=( $( compgen -W '$( cmake --help-property-list \
2>/dev/null | tail -n +2 )' -- "$cur" ) ) 2>/dev/null | grep -v "^cmake version " )' -- "$cur" ) )
return return
;; ;;
--help-variable) --help-variable)
COMPREPLY=( $( compgen -W '$( cmake --help-variable-list \ COMPREPLY=( $( compgen -W '$( cmake --help-variable-list \
2>/dev/null | tail -n +2 )' -- "$cur" ) ) 2>/dev/null | grep -v "^cmake version " )' -- "$cur" ) )
return return
;; ;;
esac esac
......
...@@ -20,7 +20,7 @@ _cpack() ...@@ -20,7 +20,7 @@ _cpack()
-D) -D)
[[ $cur == *=* ]] && return # no completion for values [[ $cur == *=* ]] && return # no completion for values
COMPREPLY=( $( compgen -W '$( cpack --help-variable-list \ COMPREPLY=( $( compgen -W '$( cpack --help-variable-list \
2>/dev/null | tail -n +2 )' -S = -- "$cur" ) ) 2>/dev/null | grep -v "^cpack version " )' -S = -- "$cur" ) )
compopt -o nospace compopt -o nospace
return return
;; ;;
...@@ -38,12 +38,12 @@ _cpack() ...@@ -38,12 +38,12 @@ _cpack()
;; ;;
--help-command) --help-command)
COMPREPLY=( $( compgen -W '$( cpack --help-command-list 2>/dev/null| COMPREPLY=( $( compgen -W '$( cpack --help-command-list 2>/dev/null|
tail -n +2 )' -- "$cur" ) ) grep -v "^cpack version " )' -- "$cur" ) )
return return
;; ;;
--help-variable) --help-variable)
COMPREPLY=( $( compgen -W '$( cpack --help-variable-list \ COMPREPLY=( $( compgen -W '$( cpack --help-variable-list \
2>/dev/null | tail -n +2 )' -- "$cur" ) ) 2>/dev/null | grep -v "^cpack version " )' -- "$cur" ) )
return return
;; ;;
esac esac
......
...@@ -63,7 +63,7 @@ _ctest() ...@@ -63,7 +63,7 @@ _ctest()
;; ;;
--help-command) --help-command)
COMPREPLY=( $( compgen -W '$( ctest --help-command-list 2>/dev/null| COMPREPLY=( $( compgen -W '$( ctest --help-command-list 2>/dev/null|
tail -n +2 )' -- "$cur" ) ) grep -v "^ctest version " )' -- "$cur" ) )
return return
;; ;;
esac esac
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment