Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-30 16:36:29 +01:00
Code Releases Activity

Merge pull request #248 from mathiasertl/master

Browse Source 
Move warnings inside check for $EJABBERD_BYPASS_WARNINGS, use variable for path
This commit is contained in:
Evgeny Khramtsov 2014-07-11 15:45:29 +04:00
commit 19cc687928
1 changed files with 33 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ejabberdctl.template
View File

@ -184,6 +184,7 @@ start()
# attach to server # attach to server
debug() debug()
{ {
if [ "$EJABBERD_BYPASS_WARNINGS" != "true" ] ; then
echo "--------------------------------------------------------------------" echo "--------------------------------------------------------------------"
echo "" echo ""
echo "IMPORTANT: we will attempt to attach an INTERACTIVE shell" echo "IMPORTANT: we will attempt to attach an INTERACTIVE shell"
@ -197,10 +198,10 @@ debug()
echo " control+c, control+c" echo " control+c, control+c"
echo "" echo ""
echo "--------------------------------------------------------------------" echo "--------------------------------------------------------------------"
echo "To bypass permanently this warning, add to ejabberdctl.cfg the line:" echo "To bypass permanently this warning, add to $EJABBERDCTL_CONFIG_PATH the line:"
echo " EJABBERD_BYPASS_WARNINGS=true" echo " EJABBERD_BYPASS_WARNINGS=true"
echo "Press any key to continue" echo "Press any key to continue"
if [ "$EJABBERD_BYPASS_WARNINGS" != "true" ] ; then
read foo read foo
fi fi
echo "" echo ""
@ -217,6 +218,7 @@ debug()
live() live()
{ {
check_start check_start
if [ "$EJABBERD_BYPASS_WARNINGS" != "true" ] ; then
echo "--------------------------------------------------------------------" echo "--------------------------------------------------------------------"
echo "" echo ""
echo "IMPORTANT: ejabberd is going to start in LIVE (interactive) mode." echo "IMPORTANT: ejabberd is going to start in LIVE (interactive) mode."
@ -229,10 +231,10 @@ live()
echo " q(). and press the Enter key" echo " q(). and press the Enter key"
echo "" echo ""
echo "--------------------------------------------------------------------" echo "--------------------------------------------------------------------"
echo "To bypass permanently this warning, add to ejabberdctl.cfg the line:" echo "To bypass permanently this warning, add to $EJABBERDCTL_CONFIG_PATH the line:"
echo " EJABBERD_BYPASS_WARNINGS=true" echo " EJABBERD_BYPASS_WARNINGS=true"
echo "Press any key to continue" echo "Press any key to continue"
if [ "$EJABBERD_BYPASS_WARNINGS" != "true" ] ; then
read foo read foo
fi fi
echo "" echo ""