Merge pull request #313 from eed3si9n/wip/exec

don't use execRunner to copy rt.jar
This commit is contained in:
eugene yokota 2019-12-23 14:48:01 -05:00 committed by GitHub
commit 7863bd28f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions

View File

@ -105,6 +105,7 @@ rt_export_file () {
echo "${sbt_bin_dir}/java9-rt-export.jar"
}
# execRunner should be called only once to give up control to java
execRunner () {
# print the arguments one to a line, quoting any containing spaces
[[ $sbt_verbose || $sbt_debug ]] && echo "# Executing command line:" && {
@ -336,9 +337,9 @@ copyRt() {
java9_rt=$(echo "$java9_ext/rt.jar")
vlog "[copyRt] java9_rt = '$java9_rt'"
if [[ ! -f "$java9_rt" ]]; then
echo Copying runtime jar.
echo copying runtime jar...
mkdir -p "$java9_ext"
execRunner "$java_cmd" \
"$java_cmd" \
"${sbt_options[@]}" \
"${java_args[@]}" \
-jar "$rtexport" \