freeciv: Use _parse_help, complete freeciv-* in addition to civclient/civserver.

completions/freeciv

@@ -1,6 +1,6 @@
 # freeciv completions
 
-have civserver &&
+have civserver || have freeciv-server &&
 _civserver()
 {
     local cur prev words cword
@@ -14,15 +14,13 @@ _civserver()
     esac
 
     if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $( compgen -W '-d -f -g -h -i -l -m -M -p -q -r -v\
-            --debug --file --gamelog --help --info --log --meta \
-            --Metaserver --port --quitidle --read --version' -- "$cur" ) )
+        COMPREPLY=( $( compgen -W '$( _parse_help "$1" )' -- "$cur" ) )
     fi
 
 } &&
-complete -F _civserver civserver
+complete -F _civserver civserver freeciv-server
 
-have civclient &&
+have civclient || have freeciv-gtk2 || have freeciv-sdl || have freeciv-xaw &&
 _civclient()
 {
     local cur prev words cword
@@ -44,13 +42,11 @@ _civclient()
     esac
 
     if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $( compgen -W '-a -d -h -l -m -n -p -P -s -S -t -v\
-            --autoconnect --debug --help --log --meta --name --port \
-            --Plugin --server --Sound --tiles --version' -- "$cur" ) )
+        COMPREPLY=( $( compgen -W '$( _parse_help "$1" )' -- "$cur" ) )
     fi
 
 } &&
-complete -F _civclient civclient
+complete -F _civclient civclient freeciv-gtk2 freeciv-sdl freeciv-xaw
 
 # Local variables:
 # mode: shell-script