service: correctly quote arguments. #15875
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
SMillerDev
approved these changes
Aug 16, 2023
carlocab
reviewed
Aug 16, 2023
Library/Homebrew/service.rb
Outdated
| @@ -399,6 +399,7 @@ def manual_command | |||
| .map { |k, v| "#{k}=\"#{v}\"" } | |||
|
|
|||
| out = vars + command if command? | |||
| out.map! { |arg| arg.include?(" ") ? "'#{arg}'" : arg } | |||
There was a problem hiding this comment.
that outputs /opt/homebrew/opt/nginx/bin/nginx -g daemon\ off\; which looks less pretty to be but is correct I guess?
There was a problem hiding this comment.
I don't think that one is correct, I believe it should be /opt/homebrew/opt/nginx/bin/nginx -g 'daemon off;'
There was a problem hiding this comment.
@SMillerDev these two are equivalent
There was a problem hiding this comment.
I believe nginx specifically complained. But if you say it works that's fine.
There was a problem hiding this comment.
@SMillerDev yeh, seems to work fine here, both work the same.
carlocab
approved these changes
Aug 16, 2023
If you have a run argument with a space in it: it will need to be quoted to be passed through correctly when run as a manual command. Fixes #15871.
This was referenced Aug 16, 2023
github-merge-queue bot
pushed a commit
to Homebrew/homebrew-core
that referenced
this pull request
Aug 23, 2023
As-of Homebrew/brew#15875 being merged and tagged: this will no longer be needed.
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.
If you have a run argument with a space in it: it will need to be quoted to be passed through correctly when run as a manual command.
Will allow removing manual quoting differences e.g. in https://github.com/Homebrew/homebrew-core/blob/66ebc5d0f0c0df80d96e901b94d4bcf5bc900534/Formula/n/nginx.rb#L149-L153
Fixes #15871.