-
Notifications
You must be signed in to change notification settings - Fork 362
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fish integration: make sure we're not in login mode before sourcing files #5802
Conversation
0254eee
to
1666d4c
Compare
Sorry for the messy PR, I wanted to get this one out of my system. |
2a6ac0b
to
dde6e34
Compare
Note for anyone that had the issue in the first place: your terminal app (mine is gnome terminal for instance) might be set up to launch the same shell as your login shell. This is convenient when you |
4d1387c
to
b32009d
Compare
@ElectreAAS #5841 was merged. Would you be able to rebase your work on top of master? I can do a review afterwards |
b32009d
to
7073911
Compare
I just rebased, it should be compatible now.
I've come to the conclusion that the last point isn't actually desired. Since fish's documentation now clearly warns about doing this, maybe we can roll with the system's assumption that the login shell does not read |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm reworking tests added in #5036 to be able to integrate them in that PR, like that we can see and track the changes.
master_changes.md
Outdated
@@ -23,6 +23,7 @@ users) | |||
* Disable ACL in Cygwin internal install to avoid permission mismatch errors [#5796 @kit-ty-kate - fix #5781] | |||
* Add `sys-pkg-manager-cmd` as an accepted field in opamrc files [#5847 @rjbou - fix #5844] | |||
* Fix `git-location` handling in init config file [#5848 @rjbou - fix #5845] | |||
* [BUG] Fish integration: Make sure we're not in login mode before sourcing files [#5802 @ElectreAAS - fix #5761] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Changelog is missing entries, e.g. changes of script lines
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should be good now, I'll let you be the judge
7073911
to
705be1f
Compare
Closing this PR as it was split into #5864, 5865 & 5866. |
I believe this resolves #5761.
If I understand correctly this comment by a fish maintainer, the standard shells don't read
.bashrc
or equivalent on login shells. However fish does, and the comment above advises to guard most of the file behind aif not status is-login
(orstatus is-interactive
, depending on context).I apply this advice here.