Skip to content
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

refactor: use conf.d for handling the fish_prompt event #86

Merged
merged 3 commits into from
Oct 19, 2018
Merged

refactor: use conf.d for handling the fish_prompt event #86

merged 3 commits into from
Oct 19, 2018

Conversation

jorgebucaran
Copy link
Contributor

@jorgebucaran jorgebucaran commented Oct 8, 2018

This PR fixes a problem when uninstalling pure where the function pre_prompt is still defined (can't be erased because it's not in its own fish file—event handlers should go in conf.d), which continues to handle fish_prompt events. At this point in time, pure's helper functions have been erased.

fish: Unknown command '__parse_current_folder'
~/.config/fish/functions/fish_prompt.fish (line 1): 
__parse_current_folder
^
in command substitution
	called on line 101 of file ~/.config/fish/functions/fish_prompt.fish

in function 'pre_prompt'
	called on standard input

in event handler: handler for generic event 'fish_prompt'

fish: Unknown command '__parse_git_branch'
~/.config/fish/functions/fish_prompt.fish (line 1): 
__parse_git_branch
^
in command substitution
	called on line 144 of file ~/.config/fish/functions/fish_prompt.fish

in function 'pre_prompt'
	called on standard input

in event handler: handler for generic event 'fish_prompt'

Additionally, it moves the installer.md and installer.fish files to their own tools/ directory closing #83.

cc @rafaelrinaldi @edouard-lopez

@jorgebucaran
Copy link
Contributor Author

@rafaelrinaldi @edouard-lopez Is there anything still to do to get this merged? Can I help in some way?

@edouard-lopez
Copy link
Member

edouard-lopez commented Oct 19, 2018

@jorgebucaran I'm ok with the change however the tests CI is broken in relation to fisher v3 I reckon.

@jorgebucaran
Copy link
Contributor Author

@edouard-lopez Yes, indeed. I’ve just finished rewriting Fisher and Fishtape is coming up next.

@edouard-lopez
Copy link
Member

edouard-lopez commented Oct 19, 2018

I fixed the CI on master with 84999c9

@edouard-lopez
Copy link
Member

edouard-lopez commented Oct 19, 2018

@jorgebucaran the CI still fails, it doesn't run on the latest version of master, could you rebase your PR?

@jorgebucaran
Copy link
Contributor Author

@edouard-lopez Rebased.

@edouard-lopez
Copy link
Member

edouard-lopez commented Oct 19, 2018

@jorgebucaran Cool, now tests fail in a meaningful way:

source: Error encountered while sourcing file '/home/travis/build/rafaelrinaldi/pure/tests/../installer.fish':
source: No such file or directory

First line of tests/installer.test.fish need to be updated to:

source $DIRNAME/../tools/installer.fish

I submitted a commit on your PR directly 👍

@edouard-lopez edouard-lopez merged commit e173c15 into pure-fish:master Oct 19, 2018
@jorgebucaran
Copy link
Contributor Author

@edouard-lopez Ah, my bad. 🙇

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants