write_jar_script: add java version option #3782
Conversation
|
As mentioned here as long as it's not using |
|
Gotcha; I thought your objection was more about adding more DSL features. Thanks. |
|
Yeah, I'd just as soon get rid of all of them ;) |
Library/Homebrew/extend/pathname.rb
Outdated
| mkpath | ||
| java_home = if java_version | ||
| <<~EOS | ||
| export JAVA_HOME="$(#{Language::Java.java_home_cmd(java_version)})" |
There was a problem hiding this comment.
Is it worth skipping the export and just putting the var on the same line?
| join(script_name).write <<~EOS | ||
| #!/bin/bash | ||
| exec java #{java_opts} -jar #{target_jar} "$@" | ||
| #{java_home}exec java #{java_opts} -jar #{target_jar} "$@" |
There was a problem hiding this comment.
Utter pedantry I realise (sorry) but does this not end up with yucky indentation in the output file?
There was a problem hiding this comment.
I don't think so? Unless you mean the two spaces between "java" and "-jar" when "java_opts" is empty?
There was a problem hiding this comment.
@apjanke np; when it was using EOS I think the beginning of this line would have had weird indentation.
There was a problem hiding this comment.
I actually think it wouldn't've, because of ~EOS's de-indentation. (That's the sort of thing that would bother me too, no worries on the pedantry.) But... moot point now. ;)
| join(script_name).write <<~EOS | ||
| #!/bin/bash | ||
| exec java #{java_opts} -jar #{target_jar} "$@" | ||
| #{java_home}exec java #{java_opts} -jar #{target_jar} "$@" |
There was a problem hiding this comment.
@apjanke np; when it was using EOS I think the beginning of this line would have had weird indentation.
|
Thanks again @apjanke! |
|
👍 |
brew stylewith your changes locally?brew testswith your changes locally?This expands
write_jar_scriptto allow specifying the Java version. This will be needed to fix some of the Java 9 breakage in Homebrew/homebrew-core#19696, for those formulae which usewrite_jar_scriptinstead ofwrite_env_script.Closes #3656. This PR supersedes it; I'm putting in a new version since there's been no activity there in two weeks.
This is indeed another way to do Homebrew/homebrew-core@39e0b03, and I know ILZ won't like it. But consider this my vote that it's nicer to have
write_jar_scriptdo it. Let me know what you decide, and if it's a nay, I'll stick with the manual script generation like themetabaseformula does does. (Feel free to just downvote this PR to vote "No"; I won't take it personal.)