mirrors/brew
1
0
Fork 0
mirror of https://github.com/Homebrew/brew.git synced 2025-07-14 16:09:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #20011 from Homebrew/revert-19946-SMillerDev-patch-1

Browse Source 
Revert "feat: allow env for write_jar_script"
This commit is contained in:
Mike McQuaid 2025-05-26 16:28:31 +00:00 committed by GitHub
commit 171fba9c84
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Library/Homebrew/extend/pathname.rb
View File

@ -423,18 +423,15 @@ class Pathname
script_name: T.any(String, Pathname), script_name: T.any(String, Pathname),
java_opts: String, java_opts: String,
java_version: T.nilable(String), java_version: T.nilable(String),
env: T::Hash[Symbol, String],
).returns(Integer) ).returns(Integer)
} }
def write_jar_script(target_jar, script_name, java_opts = "", java_version: nil, env: {}) def write_jar_script(target_jar, script_name, java_opts = "", java_version: nil)
env.merge!(Language::Java.overridable_java_home_env(java_version))
env_export = +""
env.each { |key, value| env_export << "#{key}=\"#{value}\" " }
mkpath mkpath
(self/script_name).write <<~SH (self/script_name).write <<~EOS
#!/bin/bash #!/bin/bash
#{env_export}exec "${JAVA_HOME}/bin/java" #{java_opts} -jar "#{target_jar}" "$@" export JAVA_HOME="#{Language::Java.overridable_java_home_env(java_version)[:JAVA_HOME]}"
SH exec "${JAVA_HOME}/bin/java" #{java_opts} -jar "#{target_jar}" "$@"
EOS
end end
def install_metafiles(from = Pathname.pwd) def install_metafiles(from = Pathname.pwd)