1. docker
  2. Commit 17c6fa06f66567b3613f29e2c2dcf64ab06da8cc
Browse code

Improve POSIX compatibility of bash completion

Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 76f4681b569a235f9c1838fbf083fd2b8ec684ef)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>

Harald Albers authored on 2017/03/03 18:26:33
Showing 1 changed files
contrib/completion/bash/docker
History View file @ 17c6fa0
... ... 
@@ -570,7 +570,7 @@ __docker_subcommands() {
570 570 
 			$(__docker_to_extglob "$subcommands") )
571 571 
 				subcommand_pos=$counter
572 572 
 				local subcommand=${words[$counter]}
573 
-				local completions_func=_docker_${command}_${subcommand}
573 
+				local completions_func=_docker_${command}_${subcommand//-/_}
574 574 
 				declare -F $completions_func >/dev/null && $completions_func
575 575 
 				return 0
576 576 
 				;;
... ... 
@@ -660,7 +660,7 @@ __docker_complete_capabilities_droppable() {
660 660 
 	" -- "$cur" ) )
661 661 
 }
662 662
663 
-__docker_complete_detach-keys() {
663 
+__docker_complete_detach_keys() {
664 664 
 	case "$prev" in
665 665 
 		--detach-keys)
666 666 
 			case "$cur" in
... ... 
@@ -1057,7 +1057,7 @@ _docker_container() {
1057 1057 
 }
1058 1058
1059 1059 
 _docker_container_attach() {
1060 
-	__docker_complete_detach-keys && return
1060 
+	__docker_complete_detach_keys && return
1061 1061
1062 1062 
 	case "$cur" in
1063 1063 
 		-*)
... ... 
@@ -1164,7 +1164,7 @@ _docker_container_diff() {
1164 1164 
 }
1165 1165
1166 1166 
 _docker_container_exec() {
1167 
-	__docker_complete_detach-keys && return
1167 
+	__docker_complete_detach_keys && return
1168 1168
1169 1169 
 	case "$prev" in
1170 1170 
 		--env|-e)
... ... 
@@ -1508,7 +1508,7 @@ _docker_container_run() {
1508 1508 
 			--rm
1509 1509 
 			--sig-proxy=false
1510 1510 
 		"
1511 
-		__docker_complete_detach-keys && return
1511 
+		__docker_complete_detach_keys && return
1512 1512 
 	fi
1513 1513
1514 1514 
 	local all_options="$options_with_args $boolean_options"
... ... 
@@ -1700,7 +1700,7 @@ _docker_container_run() {
1700 1700 
 }
1701 1701
1702 1702 
 _docker_container_start() {
1703 
-	__docker_complete_detach-keys && return
1703 
+	__docker_complete_detach_keys && return
1704 1704
1705 1705 
 	case "$prev" in
1706 1706 
 		--checkpoint)
... ... 
@@ -3155,7 +3155,7 @@ _docker_swarm_join() {
3155 3155 
 	esac
3156 3156 
 }
3157 3157
3158 
-_docker_swarm_join-token() {
3158 
+_docker_swarm_join_token() {
3159 3159 
 	case "$cur" in
3160 3160 
 		-*)
3161 3161 
 			COMPREPLY=( $( compgen -W "--help --quiet -q --rotate" -- "$cur" ) )
... ... 
@@ -3185,7 +3185,7 @@ _docker_swarm_unlock() {
3185 3185 
 	esac
3186 3186 
 }
3187 3187
3188 
-_docker_swarm_unlock-key() {
3188 
+_docker_swarm_unlock_key() {
3189 3189 
 	case "$cur" in
3190 3190 
 		-*)
3191 3191 
 			COMPREPLY=( $( compgen -W "--help --quiet -q --rotate" -- "$cur" ) )
... ... 
@@ -4303,7 +4303,7 @@ _docker() {
4303 4303 
 		command_pos=0
4304 4304 
 	fi
4305 4305
4306 
-	local completions_func=_docker_${command}
4306 
+	local completions_func=_docker_${command//-/_}
4307 4307 
 	declare -F $completions_func >/dev/null && $completions_func
4308 4308
4309 4309 
 	eval "$previous_extglob_setting"