fix: enable to override JAVABIN of wrapper script (#1432)

tanishiking · web-flow · commit 4960e77f5562 · 2022-10-10T12:25:52.000+03:00
fix #1431
diff --git a/scala/private/phases/phase_write_executable.bzl b/scala/private/phases/phase_write_executable.bzl
@@ -103,7 +103,7 @@ def _write_executable_non_windows(ctx, executable, rjars, main_class, jvm_flags,
         [ctx.expand_location(f, ctx.attr.data) for f in jvm_flags],
     )
 
-    javabin = "export REAL_EXTERNAL_JAVA_BIN=${JAVABIN};JAVABIN=%s/%s" % (
+    javabin = "export REAL_EXTERNAL_JAVA_BIN=${JAVABIN};JAVABIN=${JAVABIN:-%s/%s}" % (
         runfiles_root(ctx),
         wrapper.short_path,
     )

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ def _write_executable_non_windows(ctx, executable, rjars, main_class, jvm_flags,`
`103`	`103`	`[ctx.expand_location(f, ctx.attr.data) for f in jvm_flags],`
`104`	`104`	`)`
`105`	`105`
`106`		`- javabin = "export REAL_EXTERNAL_JAVA_BIN=${JAVABIN};JAVABIN=%s/%s" % (`
	`106`	`+ javabin = "export REAL_EXTERNAL_JAVA_BIN=${JAVABIN};JAVABIN=${JAVABIN:-%s/%s}" % (`
`107`	`107`	`runfiles_root(ctx),`
`108`	`108`	`wrapper.short_path,`
`109`	`109`	`)`