bash,zsh: ensure completion for both pmlogdump and pmdumplog

qa/1100

@@ -91,6 +91,9 @@ _check_completion_bash()
   cmds="$(grep '  pcp2.*)' $bash_comp | tr -d ')')"
   cmds="$cmds $(grep '  pm.*)' $bash_comp | tr -d ')')"
   for cmd in $cmds; do
+    # Handle aliases
+    str="  $cmd"
+    [ "$cmd" = "pmlogdump|pmdumplog" ] && cmd=pmdumplog && str="  pmlogdump|pmdumplog"
     which $cmd > /dev/null 2>&1 || continue
     $skip_pcp2elasticsearch && [ "$cmd" = pcp2elasticsearch ] && continue
     $skip_pcp2graphite && [ "$cmd" = pcp2graphite ] && continue
@@ -104,7 +107,7 @@ _check_completion_bash()
     $skip_pmdumptext && [ "$cmd" = pmdumptext ] && continue
     $skip_pmrep && [ "$cmd" = pmrep ] && continue
     $skip_pmseries && [ "$cmd" = pmseries ] && continue
-    comps=$(grep -A 1 "  $cmd)" $bash_comp | tail -n 1 | sed -e 's,all_args=",,' -e 's,",,')
+    comps=$(grep -A 1 "$str)" $bash_comp | tail -n 1 | sed -e 's,all_args=",,' -e 's,",,')
     # Need $tmp.err and PCP_STDERR for pmchart ...
     #
     rm -f $tmp.err

qa/967

@@ -115,7 +115,10 @@ _check_completion_zsh()
     pytool=$(awk "/common_python=/,/  \)/" $zsh_comp)
     pmda=$(awk "/common_pmda=/,/  \)/" $zsh_comp)
     version=V
-    comps=$(awk "/  $cmd\)/,/;;/" $zsh_comp | sed -e 's,equivalent to .*,,')
+    # Handle aliases
+    str="  $cmd"
+    [ "$cmd" = "pmlogdump" -o "$cmd" = "pmdumplog" ] && str="  pmlogdump|pmdumplog"
+    comps=$(awk "/$str\)/,/;;/" $zsh_comp | sed -e 's,equivalent to .*,,')
     # Need $tmp.err and PCP_STDERR for pmchart ...
     #
     rm -f $tmp.err

src/bashrc/pcp_completion.sh

@@ -52,7 +52,7 @@ _pcp_complete()
         all_args="AahnOPSsTtVZz"
         arg_regex="-[AahnOSsTtZz]"
     ;;
-    pmdumplog)
+    pmlogdump|pmdumplog)
         all_args="adehIiLlMmnrSsTtVvxZz"
         arg_regex="-[nSTvZ]"
     ;;
@@ -210,4 +210,4 @@ _pcp_complete()
         fi
     fi
 }
-complete -F _pcp_complete -o default pcp2elasticsearch pcp2graphite pcp2influxdb pcp2json pcp2spark pcp2xlsx pcp2xml pcp2zabbix pmclient pmdumplog pmdumptext pmevent pmfind pmie pmie2col pmiectl pminfo pmjson pmlc pmlogcheck pmlogctl pmlogextract pmlogger pmloglabel pmlogpaste pmlogreduce pmlogsize pmlogsummary pmprobe pmrep pmseries pmstat pmstore pmval
+complete -F _pcp_complete -o default pcp2elasticsearch pcp2graphite pcp2influxdb pcp2json pcp2spark pcp2xlsx pcp2xml pcp2zabbix pmclient pmdumplog pmdumptext pmevent pmfind pmie pmie2col pmiectl pminfo pmjson pmlc pmlogcheck pmlogctl pmlogdump pmlogextract pmlogger pmloglabel pmlogpaste pmlogreduce pmlogsize pmlogsummary pmprobe pmrep pmseries pmstat pmstore pmval

src/zshrc/_pcp

@@ -1,4 +1,4 @@
-#compdef pcp pcp2arrow pcp2elasticsearch pcp2graphite pcp2influxdb pcp2json pcp2spark pcp2xlsx pcp2xml pcp2zabbix pmafm pmchart pmclient pmclient_fg=pmclient pmdbg pmdiff pmdumplog pmdumptext pmerr pmevent=pmval pmfind pmie pmie2col pmiectl=pmlogctl pminfo pmiostat pmjson pmlc pmlogcheck pmlogctl pmlogextract pmlogger pmloglabel pmlogpaste pmlogreduce pmlogsize pmlogsummary pmprobe pmrep pmseries pmstat pmstore pmval
+#compdef pcp pcp2arrow pcp2elasticsearch pcp2graphite pcp2influxdb pcp2json pcp2spark pcp2xlsx pcp2xml pcp2zabbix pmafm pmchart pmclient pmclient_fg=pmclient pmdbg pmdiff pmdumplog pmdumptext pmerr pmevent=pmval pmfind pmie pmie2col pmiectl=pmlogctl pminfo pmiostat pmjson pmlc pmlogcheck pmlogctl pmlogdump pmlogextract pmlogger pmloglabel pmlogpaste pmlogreduce pmlogsize pmlogsummary pmprobe pmrep pmseries pmstat pmstore pmval
 #
 # PCP <https://pcp.io> completions for zsh <http://zsh.sf.net>.
 #
@@ -353,7 +353,7 @@ _pcp () {
       '2:archive:->archives' \
       && return 0
   ;;
-  pmdumplog)
+  pmlogdump|pmdumplog)
     arch_req=1
     _arguments -C -S -s \
       "$common_help[@]" \