From 4914b33f8cfe67df5839da4d8c07118874a30584 Mon Sep 17 00:00:00 2001
From: Badlop <badlop@process-one.net>
Date: Thu, 15 Apr 2021 19:24:30 +0200
Subject: [PATCH] Support the recent changes in the "ejabberdctl help" command
 (#3569)

---
 tools/ejabberdctl.bc | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/tools/ejabberdctl.bc b/tools/ejabberdctl.bc
index 3a63e29fd..2ebae4a3b 100644
--- a/tools/ejabberdctl.bc
+++ b/tools/ejabberdctl.bc
@@ -4,12 +4,15 @@
 get_help()
 {
     local COMMANDCACHE=/var/log/ejabberd/bash_completion_$RANDOM
-    ejabberdctl $CTLARGS help >$COMMANDCACHE
+    ejabberdctl $CTLARGS help tags >$COMMANDCACHE.tags
+    ejabberdctl $CTLARGS >$COMMANDCACHE
     if [[ $? == 2 ]] ; then
         ISRUNNING=1
-        runningcommands=`cat $COMMANDCACHE | grep "^   [a-z]" | awk '{print $1}' | xargs`
+        runningcommands=`cat $COMMANDCACHE | grep "^  [a-z]" | awk '{print $1}' | xargs`
+        runningtags=`cat $COMMANDCACHE.tags | grep "^  [a-z]" | awk '{print $1}' | xargs`
     fi
     rm $COMMANDCACHE
+    rm $COMMANDCACHE.tags
 }
 
 _ejabberdctl()
@@ -22,8 +25,8 @@ _ejabberdctl()
     cur="${COMP_WORDS[COMP_CWORD]}"
     prev="${COMP_WORDS[COMP_CWORD-1]}"
 
-    local startcoms="start debug live"
-    local startpars="--config-dir --config --ctl-config --logs --spool"
+    local startcoms="start foreground foreground-quiet live debug etop iexdebug iexlive ping started stopped"
+    local startpars="--config-dir --config --ctl-config --logs --node --spool"
 
     local i=1
     local CTLARGS=""
@@ -55,7 +58,7 @@ _ejabberdctl()
             ;;
         help)
             get_help
-            COMPREPLY=($(compgen -W "${runningcommands}" -- $cur))
+            COMPREPLY=($(compgen -W "${runningcommands} ${runningtags}" -- $cur))
             return 0
             ;;
         --node)