Skip to content

Commit 6a30de0

Browse files
committed
Dont do a user install if running in a venv
1 parent 3c6c949 commit 6a30de0

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

cogs/plugins.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,19 +115,23 @@ async def load_plugin(self, username, repo, plugin_name, branch):
115115

116116
if "requirements.txt" in os.listdir(dirname):
117117
# Install PIP requirements
118+
119+
venv = hasattr(sys, 'real_prefix') # in a virtual env
120+
user_install = '--user' if not venv else ''
121+
118122
try:
119123
if os.name == "nt": # Windows
120124
await self.bot.loop.run_in_executor(
121125
None,
122126
self._asubprocess_run,
123-
f"pip install -r {dirname}/requirements.txt --user -q -q",
127+
f"pip install -r {dirname}/requirements.txt {user_install} -q -q",
124128
)
125129
else:
126130
await self.bot.loop.run_in_executor(
127131
None,
128132
self._asubprocess_run,
129133
f"python3 -m pip install -U -r {dirname}/"
130-
"requirements.txt --user -q -q",
134+
f"requirements.txt {user_install} -q -q",
131135
)
132136
# -q -q (quiet)
133137
# so there's no terminal output unless there's an error

0 commit comments

Comments
 (0)