diff --git a/maple b/maple index 14e28a7..d2d8170 100755 --- a/maple +++ b/maple @@ -44,7 +44,7 @@ # echo -e '\033[0;34m'"/MMMMMMM i=`cat maple|grep -n MARKER|cut -f1 -d":"`;i=$(echo $i|xargs|cut -f2 -d" ");ii=`wc -l maple|cut -f1 -d" "`; -iii=$((ii-i));tail -n $iii $0>mpl;MD5=$(md5sum mpl|cut -f1 -d ' ');rm mpl;DM5="e742714d27a5d28dc9b8d2e9536c8240"; +iii=$((ii-i));tail -n $iii $0>mpl;MD5=$(md5sum mpl|cut -f1 -d ' ');rm mpl;DM5="96ddaec5d78305a094158ead0e4c062f"; [ "$MD5" = "$DM5" ] || exit; # MARKER ############################################################################################################ @@ -324,7 +324,7 @@ kmodesetup() { cat activation >> env/bin/activate fi - [ "$MODE" = "1" ] && (cp storage/bot/variants/core/bot_maple.ini bot_maple.ini;pip install -r storage/bot/requirements/requirements_core.txt) + [ "$MODE" = "1" ] && (cp storage/bot/variants/core/maple.ini bot_maple.ini;pip install -r storage/bot/requirements/requirements_core.txt) [ "$MODE" = "2" ] && (cp storage/bot/variants/dupe/bot_maple__services.py bot_maple.py;pip install -r storage/bot/requirements/requirements_services.txt) [ "$MODE" = "3" ] && (cp storage/bot/variants/dupe/bot_maple__devops.py bot_maple.py;pip install -r storage/bot/requirements/requirements_devops.txt) @@ -849,6 +849,7 @@ cmd_setup () { if [ ! -e plugins ]; then mkdir plugins cat storage/bot/variants/default/bot_maple__default__initial_plugins.txt|grep -v "#"|grep -v irc3|sed s/plugins.//|xargs -I{} cp storage/bot/plugins/{}.py plugins/ + HYDRA____SERVICING=0 if [ $DISCORD__SERVICING -eq 0 ]; then cat plugins/tool_bus_plugin.py|sed s/"???DISCORD???"/"SERVICES_DISCORD=False"/g > plugins/tool_bus_plugin.tmp;mv plugins/tool_bus_plugin.tmp plugins/tool_bus_plugin.py @@ -968,7 +969,12 @@ cmd_setup_bot () { if [ ! -e plugins ]; then mkdir plugins cat storage/bot/variants/core/bot_maple__core__initial_plugins.txt|grep -v "#"|grep -v irc3|sed s/plugins.//|xargs -I{} cp storage/bot/plugins/{}.py plugins/ - cat bot_maple.ini|sed '/includes/r storage/bot/variants/core/bot_maple__core__initial_plugins.txt' > bot_maple.tmp;mv bot_maple.tmp bot_maple.ini + cat maple.ini|sed '/includes/r storage/bot/variants/core/bot_maple__core__initial_plugins.txt' > maple.tmp;mv maple.tmp maple.ini + if [ $HYDRA____SERVICING -eq 0 ]; then + cat plugins/net_hydra_plugin.py|sed s/"???HYDRA???"/"SERVICES_HYDRA=False"/g > plugins/net_hydra_plugin.tmp;mv plugins/net_hydra_plugin.tmp plugins/net_hydra_plugin.py + else + cat plugins/net_hydra_plugin.py|sed s/"???HYDRA???"/"SERVICES_HYDRA=True"/g > plugins/net_hydra_plugin.tmp;mv plugins/net_hydra_plugin.tmp plugins/net_hydra_plugin.py + fi fi; elif [ $RESULT -eq 2 ]; then (kmode 2); @@ -1071,6 +1077,11 @@ cmd_setup_bot () { cat plugins/net_irc_plugin.py|sed s/"???MATRIX???"/"SERVICES_MATRIX=False"/g > plugins/net_irc_plugin.tmp;mv plugins/net_irc_plugin.tmp plugins/net_irc_plugin.py cat plugins/net_irc_plugin.py|sed s/"???DISCORD???"/"SERVICES_DISCORD=False"/g > plugins/net_irc_plugin.tmp;mv plugins/net_irc_plugin.tmp plugins/net_irc_plugin.py cat plugins/net_irc_plugin.py|sed '/includes/r storage/bot/variants/dupe/bot_maple__devops__initial_plugins.txt' > plugins/net_irc_plugin.tmp;mv plugins/net_irc_plugin.tmp plugins/net_irc_plugin.py + if [ $HYDRA____SERVICING -eq 0 ]; then + cat plugins/net_hydra_plugin.py|sed s/"???HYDRA???"/"SERVICES_HYDRA=False"/g > plugins/net_hydra_plugin.tmp;mv plugins/net_hydra_plugin.tmp plugins/net_hydra_plugin.py + else + cat plugins/net_hydra_plugin.py|sed s/"???HYDRA???"/"SERVICES_HYDRA=True"/g > plugins/net_hydra_plugin.tmp;mv plugins/net_hydra_plugin.tmp plugins/net_hydra_plugin.py + fi fi; fi; fi;