[osmium-tool] 26/97: Fix zsh completion for osmium command.

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to tag v1.0.0
in repository osmium-tool.

commit 89ea2bb88a31f2396de7575f4a9d3c8998e11d70
Author: Jochen Topf <jochen at topf.org>
Date:   Wed Jul 23 17:39:55 2014 +0200

    Fix zsh completion for osmium command.
---
 zsh_completion/_osmium | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/zsh_completion/_osmium b/zsh_completion/_osmium
index 35a3c48..1aa92c6 100644
--- a/zsh_completion/_osmium
+++ b/zsh_completion/_osmium
@@ -13,15 +13,11 @@
 #  http://zsh.sourceforge.net/Guide/zshguide06.html
 #
 
-local -a osmium_commands
-osmium_commands=(apply-changes cat fileinfo help merge-changes time-filter)
-
-local -a osmium_help_topics
-osmium_help_topics=(${osmium_commands} file-formats)
-
 osmium_file_glob="'*.(osm|osh|osc|pbf|osm.pbf) *.(osm|osh|osc).(bz2|gz)'"
 
 _osmium() {
+    local -a osmium_commands
+    osmium_commands=(apply-changes cat fileinfo help merge-changes time-filter)
     if (( CURRENT > 2 )); then
         # Remember the subcommand name
         local cmd=${words[2]}
@@ -33,7 +29,7 @@ _osmium() {
         # Run the completion for the subcommand
         _osmium-$cmd
     else
-        _describe -t osmium-commands 'osmium command' osmium_commands
+        _describe -t osmium-commands 'osmium subcommand' osmium_commands
     fi
 }
 
@@ -144,6 +140,8 @@ _osmium_object_type() {
 }
 
 _osmium-help() {
+    local -a osmium_help_topics
+    osmium_help_topics=(apply-changes cat fileinfo help merge-changes time-filter file-formats)
     _describe -t osmium-help-topics 'osmium help topics' osmium_help_topics
 }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osmium-tool.git