cmd/prof: raise error when cmd is bash file #10280
Merged
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
hyuraku
changed the title
MikeMcQuaid
reviewed
Jan 11, 2021
Library/Homebrew/commands.rb
Outdated
| @@ -197,4 +197,8 @@ def rebuild_commands_completion_list | |||
| file = HOMEBREW_CACHE/"all_commands_list.txt" | |||
| file.atomic_write("#{commands(aliases: true).sort.join("\n")}\n") | |||
| end | |||
|
|
|||
| def only_bash_command_list | |||
| internal_commands.reject { |cmd| valid_internal_cmd?(cmd) } | |||
There was a problem hiding this comment.
I think this function makes sense but not the implementation. This should check for a file extension instead.
Library/Homebrew/brew.rb
Outdated
| @@ -131,6 +131,8 @@ class MissingEnvironmentVariables < RuntimeError; end | |||
| end | |||
| exec "brew-#{cmd}", *ARGV | |||
| else | |||
| raise "command made by bash not ruby: #{cmd}" if Commands.only_bash_command_list.include?(cmd) | |||
There was a problem hiding this comment.
It doesn't seem like this should be in brew.rb but prof.rb instead.
hyuraku
changed the title
MikeMcQuaid
reviewed
Jan 11, 2021
Library/Homebrew/dev-cmd/prof.rb
Outdated
| @@ -26,6 +26,8 @@ def prof | |||
|
|
|||
| brew_rb = (HOMEBREW_LIBRARY_PATH/"brew.rb").resolved_path | |||
| FileUtils.mkdir_p "prof" | |||
| cmd = args.named.first | |||
| raise "#{cmd} is made by bash not ruby" if Commands.path(cmd).extname == ".sh" | |||
There was a problem hiding this comment.
Suggested change
| raise "#{cmd} is made by bash not ruby" if Commands.path(cmd).extname == ".sh" | |
| raise UsageError, "#{cmd} is a Bash command!" if Commands.path(cmd).extname == ".sh" |
hyuraku
force-pushed
the
cmd/commands_add_only_bash_command_list
branch
from
76f1a7c
to
c56fff3
Compare
|
@MikeMcQuaid |
MikeMcQuaid
approved these changes
Jan 18, 2021
|
Thanks again @hyuraku! |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
brew stylewith your changes locally?brew typecheckwith your changes locally?brew testswith your changes locally?brew manlocally and committed any changes?brew prof updatecaused an error becauseupdateis made by bash, not ruby. However, the error messageError: Unknown command: updatewas not correct, so I added the correct message.