Fix podman inspect bash completions

Also fixed illegal function __podman_complete_detach_keys()

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

Closes: #781
Approved by: baude

completions/bash/podman

@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
 : ${PROG:=$(basename ${BASH_SOURCE})}
 
 __podman_previous_extglob_setting=$(shopt -p extglob)
@@ -405,7 +406,7 @@ __podman_complete_capabilities() {
 	" -- "$cur" ) )
 }
 
-__podman_complete_detach-keys() {
+__podman_complete_detach_keys() {
 	case "$prev" in
 		--detach-keys)
 			case "$cur" in
@@ -418,7 +419,7 @@ __podman_complete_detach-keys() {
 			esac
 
 			__podman_nospace
-			return
+			return 0
 			;;
 	esac
 	return 1
@@ -914,28 +915,55 @@ _podman_inspect() {
 
   local all_options="$options_with_args $boolean_options"
 
+	local preselected_type
+	local type
+
+	if [ "$1" = "--type" ] ; then
+		preselected_type=yes
+		type="$2"
+	else
+		type=$(__podman_value_of_option --type)
+	fi
+
+	case "$prev" in
+		--format|-f)
+			return
+			;;
+		--type)
+			if [ -z "$preselected_type" ] ; then
+				COMPREPLY=( $( compgen -W "container image" -- "$cur" ) )
+				return
+			fi
+			;;
+	esac
+
 	case "$cur" in
 		-*)
-            COMPREPLY=($(compgen -W "$boolean_options $options_with_args" -- "$cur"))
+			local options="--format -f --help --size -s"
+			if [ -z "$preselected_type" ] ; then
+				options+=" --type"
+			fi
+			COMPREPLY=( $( compgen -W "$options" -- "$cur" ) )
 			;;
 		*)
 			case "$type" in
 				'')
 					COMPREPLY=( $( compgen -W "
-                        $(__podman_complete_container_names)
+						$(__podman_containers --all)
-                        $(__podman_complete_images)
+						$(__podman_images --force-tag --id)
 					" -- "$cur" ) )
+					__ltrim_colon_completions "$cur"
 					;;
 				container)
-                    __podman_complete_container_names
+					__podman_complete_containers_all
 					;;
-                images)
+				image)
-                    __podman_complete_images
+					__podman_complete_images --force-tag --id
 					;;
 			esac
-            ;;
 	esac
 }
+
 _podman_kill() {
      local options_with_args="
      --signal -s
@@ -1185,7 +1213,7 @@ _podman_container_run() {
 			--rm
 			--sig-proxy=false
 		"
-		__podman_complete_detach-keys && return
+		__podman_complete_detach_keys && return
 	fi
 
     case "$cur" in