@@ -504,38 +504,35 @@ _cmd_gw() {
504504_cmd_list () {
505505 local closest_resource
506506 local resource=" ${1} "
507- local valid_resources=$( _listFunctions _list_ | sed " s,_list_,,g" )
507+ local valid_resources
508+
509+ valid_resources=$( _listPrefixedFunctions _list_)
508510
509- if [[ ! " ${valid_resources[@]} " =~ " ${resource} " ]]; then
510- closest_resource= $( echo " ${valid_resources[@]} " | sed " s, , \\ n,g " | _fzf --filter " ${resource} " | head -n 1 )
511+ if [[ ${resource} == " " ]]; then
512+ _print_step " Listing valid resources... "
511513
512- if [[ " ${closest_resource} " != " " ]] ; then
513- _print_error " ' ${resource} ' is not a valid option. Did you mean ' ${closest_resource} '? "
514- fi
514+ _listPrefixedFunctions _list_
515+
516+ exit
515517 fi
516518
517- shopt -s extglob
519+ if ! echo -e " ${valid_resources} " | grep -wq " ${resource} " ; then
520+ closest_resource=$( _listPrefixedFunctions _list_| _fzf --filter " ${resource} " | head -n 1)
518521
519- local valid_resources_pattern=" @($( echo ${valid_resources[@]} | sed " s, ,\|,g" ) )"
522+ if echo -e " ${valid_resources} " | grep -wq " ${closest_resource} " && _confirm " Resource \" ${resource} \" is unknown; use closest resource \" ${closest_resource} \" instead?" ; then
523+ resource=${closest_resource}
524+ else
525+ _print_error " Resource \" ${resource} \" is invalid. Listing valid resources..."
520526
521- case ${resource} in
522- ${valid_resources_pattern} )
523- _print_step " Listing all ${resource// _/ } ..."
527+ _listPrefixedFunctions _list_
524528
525- _list_${resource}
526- ;;
527- " " )
528- _print_step " Possible resources to list"
529+ exit
530+ fi
531+ fi
529532
530- echo ${valid_resources[@]} | sed " s, ,\\ n,g"
531- ;;
532- * )
533- if [[ " ${closest_resource} " == " " ]]; then
534- _print_error " Not a valid resource; please provide a valid resource"
535- fi
533+ _print_step " Listing all ${resource// _/ } "
536534
537- ;;
538- esac
535+ _list_" ${resource} "
539536}
540537_cmd_ports () {
541538 local serviceName=" ${1} "
0 commit comments