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

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

View File

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