Skip to content

Commit

Permalink
Improve venv shell activation in fish shell
Browse files Browse the repository at this point in the history
Instead of mimicking a user typing the command we use
fish's builtin `--init-command` option.
  • Loading branch information
MrGreenTea committed Dec 18, 2023
1 parent 951ba48 commit b921916
Showing 1 changed file with 8 additions and 6 deletions.
14 changes: 8 additions & 6 deletions src/poetry/utils/shell.py
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,12 @@ def activate(self, env: VirtualEnv) -> int | None:
cmd = f"{self._get_source_command()} {shlex.quote(str(activate_path))}"

with env.temp_environ():
args = ["-e", cmd] if self._name == "nu" else ["-i"]
if self._name == "nu":
args = ["-e", cmd]
elif self._name == "fish":
args = ["-i", "--init-command", cmd]
else:
args = ["-i"]

c = pexpect.spawn(
self._path, args, dimensions=(terminal.lines, terminal.columns)
Expand All @@ -120,14 +125,11 @@ def activate(self, env: VirtualEnv) -> int | None:
c.sendline(f"emulate bash -c '. {shlex.quote(str(activate_path))}'")
elif self._name == "xonsh":
c.sendline(f"vox activate {shlex.quote(str(env.path))}")
elif self._name == "nu":
# If this is nu, we don't want to send the activation command to the
elif self._name in ["nu", "fish"]:
# If this is nu or fish, we don't want to send the activation command to the
# command line since we already ran it via the shell's invocation.
pass
else:
if self._name in ["fish"]:
# Under fish, "\r" should be sent explicitly
cmd += "\r"
c.sendline(cmd)

def resize(sig: Any, data: Any) -> None:
Expand Down

0 comments on commit b921916

Please sign in to comment.