Linuxbrew shell fix #6215
Merged
Linuxbrew shell fix #6215
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Addresses issue: #6197 Previously these branches would trip if the shell name was present anywhere in the cmd path. This updates the check to only look at the end.
Updates the if else block to only allow an explicit set of shells instead of defaulting to the `activate` script.
matteius
reviewed
Aug 29, 2024
| # Support for fish shell. | ||
| if "fish" in cmd: | ||
| # Suffix and source command for various shells. | ||
| if cmd.endswith("/sh", "/bash", "/zsh"): |
There was a problem hiding this comment.
This doesn't work on older python versions -- I am raising a PR:
matteius@matteius-VirtualBox:~/opensensor-api$ pipenv shell
Loading .env environment variables...
Launching subshell in virtual environment...
bash
Traceback (most recent call last):
File "/home/matteius/.local/bin/pipenv", line 8, in <module>
sys.exit(cli())
^^^^^
File "/home/matteius/pipenv/pipenv/vendor/click/core.py", line 1157, in __call__
return self.main(*args, **kwargs)
^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/home/matteius/pipenv/pipenv/cli/options.py", line 52, in main
return super().main(*args, **kwargs, windows_expand_args=False)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/home/matteius/pipenv/pipenv/vendor/click/core.py", line 1078, in main
rv = self.invoke(ctx)
^^^^^^^^^^^^^^^^
File "/home/matteius/pipenv/pipenv/vendor/click/core.py", line 1688, in invoke
return _process_result(sub_ctx.command.invoke(sub_ctx))
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/home/matteius/pipenv/pipenv/vendor/click/core.py", line 1434, in invoke
return ctx.invoke(self.callback, **ctx.params)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/home/matteius/pipenv/pipenv/vendor/click/core.py", line 783, in invoke
return __callback(*args, **kwargs)
^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/home/matteius/pipenv/pipenv/vendor/click/decorators.py", line 92, in new_func
return ctx.invoke(f, obj, *args, **kwargs)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/home/matteius/pipenv/pipenv/vendor/click/core.py", line 783, in invoke
return __callback(*args, **kwargs)
^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/home/matteius/pipenv/pipenv/cli/command.py", line 400, in shell
do_shell(
File "/home/matteius/pipenv/pipenv/routines/shell.py", line 48, in do_shell
shell.fork_compat(*fork_args)
File "/home/matteius/pipenv/pipenv/shells.py", line 111, in fork_compat
c.sendline(_get_activate_script(self.cmd, venv))
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/home/matteius/pipenv/pipenv/shells.py", line 40, in _get_activate_script
if cmd.endswith("/sh", "/bash", "/zsh"):
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
TypeError: slice indices must be integers or None or have an __index__ method
There was a problem hiding this comment.
Actually there are other issues with this change -- I recommend reverting it -- for example, my cmd is just "bash" not "/bash" so fixing that yields:
ValueError: unknown shell bash
There was a problem hiding this comment.
I opened #6230 fixing this.
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add some cosmetic change to the comments.
Basically, all the work was done by @JoshStern.
See #6212 .