From 7e8f0bbf12f1967981fbf3d281e6c9a47d70c04d Mon Sep 17 00:00:00 2001 From: Romain J Date: Thu, 2 Jan 2020 16:49:22 +0100 Subject: [PATCH] fix(prefix): fix default prefix not working --- bot.py | 3 +-- venv/bin/activate | 2 +- venv/bin/activate.csh | 2 +- venv/bin/activate.fish | 2 +- venv/bin/chardetect | 6 ++---- venv/bin/easy_install | 2 +- venv/bin/import_expression | 6 ++---- venv/bin/pip | 2 +- venv/bin/pip3 | 2 +- venv/bin/tcp-latency | 6 ++---- venv/pyvenv.cfg | 2 +- 11 files changed, 14 insertions(+), 21 deletions(-) diff --git a/bot.py b/bot.py index c88398f..5ccce8f 100755 --- a/bot.py +++ b/bot.py @@ -36,9 +36,8 @@ l_extensions: List[str] = [ async def _prefix_callable(bot, message: discord.message) -> list: - extras = [bot.cluster.get('Name')] + extras = [bot.cluster.get('Name') + '.'] if message.guild is not None: - extras = [] if str(message.guild.id) in bot.prefixes: extras.extend( bot.prefixes.get(str(message.guild.id), "prefixes").split( diff --git a/venv/bin/activate b/venv/bin/activate index 3f4bf1c..c9a2175 100644 --- a/venv/bin/activate +++ b/venv/bin/activate @@ -37,7 +37,7 @@ deactivate () { # unset irrelevant variables deactivate nondestructive -VIRTUAL_ENV="/home/romain/gnousEU/rm-dev01/tuxbot-bot/venv" +VIRTUAL_ENV="/opt/tuxbot-bot/venv" export VIRTUAL_ENV _OLD_VIRTUAL_PATH="$PATH" diff --git a/venv/bin/activate.csh b/venv/bin/activate.csh index 98060ea..83031a3 100644 --- a/venv/bin/activate.csh +++ b/venv/bin/activate.csh @@ -8,7 +8,7 @@ alias deactivate 'test $?_OLD_VIRTUAL_PATH != 0 && setenv PATH "$_OLD_VIRTUAL_PA # Unset irrelevant variables. deactivate nondestructive -setenv VIRTUAL_ENV "/home/romain/gnousEU/rm-dev01/tuxbot-bot/venv" +setenv VIRTUAL_ENV "/opt/tuxbot-bot/venv" set _OLD_VIRTUAL_PATH="$PATH" setenv PATH "$VIRTUAL_ENV/bin:$PATH" diff --git a/venv/bin/activate.fish b/venv/bin/activate.fish index 4963b20..49518e4 100644 --- a/venv/bin/activate.fish +++ b/venv/bin/activate.fish @@ -29,7 +29,7 @@ end # unset irrelevant variables deactivate nondestructive -set -gx VIRTUAL_ENV "/home/romain/gnousEU/rm-dev01/tuxbot-bot/venv" +set -gx VIRTUAL_ENV "/opt/tuxbot-bot/venv" set -gx _OLD_VIRTUAL_PATH $PATH set -gx PATH "$VIRTUAL_ENV/bin" $PATH diff --git a/venv/bin/chardetect b/venv/bin/chardetect index 967b10d..a43fcee 100755 --- a/venv/bin/chardetect +++ b/venv/bin/chardetect @@ -1,10 +1,8 @@ -#!/home/romain/gnousEU/rm-dev01/tuxbot-bot/venv/bin/python +#!/opt/tuxbot-bot/venv/bin/python # -*- coding: utf-8 -*- import re import sys - from chardet.cli.chardetect import main - if __name__ == '__main__': - sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0]) + sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0]) sys.exit(main()) diff --git a/venv/bin/easy_install b/venv/bin/easy_install index de4c6b6..6475025 100755 --- a/venv/bin/easy_install +++ b/venv/bin/easy_install @@ -1,4 +1,4 @@ -#!/home/romain/gnousEU/rm-dev01/tuxbot-bot/venv/bin/python +#!/opt/tuxbot-bot/venv/bin/python # -*- coding: utf-8 -*- import re import sys diff --git a/venv/bin/import_expression b/venv/bin/import_expression index b88a6d8..0d4fa1e 100755 --- a/venv/bin/import_expression +++ b/venv/bin/import_expression @@ -1,10 +1,8 @@ -#!/home/romain/gnousEU/rm-dev01/tuxbot-bot/venv/bin/python +#!/opt/tuxbot-bot/venv/bin/python # -*- coding: utf-8 -*- import re import sys - from import_expression.__main__ import main - if __name__ == '__main__': - sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0]) + sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0]) sys.exit(main()) diff --git a/venv/bin/pip b/venv/bin/pip index 6b21959..c8cec3c 100755 --- a/venv/bin/pip +++ b/venv/bin/pip @@ -1,4 +1,4 @@ -#!/home/romain/gnousEU/rm-dev01/tuxbot-bot/venv/bin/python +#!/opt/tuxbot-bot/venv/bin/python # -*- coding: utf-8 -*- import re import sys diff --git a/venv/bin/pip3 b/venv/bin/pip3 index 6b21959..c8cec3c 100755 --- a/venv/bin/pip3 +++ b/venv/bin/pip3 @@ -1,4 +1,4 @@ -#!/home/romain/gnousEU/rm-dev01/tuxbot-bot/venv/bin/python +#!/opt/tuxbot-bot/venv/bin/python # -*- coding: utf-8 -*- import re import sys diff --git a/venv/bin/tcp-latency b/venv/bin/tcp-latency index a2583cb..f368ef6 100755 --- a/venv/bin/tcp-latency +++ b/venv/bin/tcp-latency @@ -1,10 +1,8 @@ -#!/home/romain/gnousEU/rm-dev01/tuxbot-bot/venv/bin/python +#!/opt/tuxbot-bot/venv/bin/python # -*- coding: utf-8 -*- import re import sys - from tcp_latency.tcp_latency import _main - if __name__ == '__main__': - sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0]) + sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0]) sys.exit(_main()) diff --git a/venv/pyvenv.cfg b/venv/pyvenv.cfg index 1f606f9..517a829 100644 --- a/venv/pyvenv.cfg +++ b/venv/pyvenv.cfg @@ -1,3 +1,3 @@ home = /usr/bin include-system-site-packages = false -version = 3.8.0 +version = 3.8.1