Use LnBinary instead of hardcoded /bin/ln in jvm.sh (#21488)

Fixes #21487
pantsbuild · Oct 5, 2024 · 727819f · 727819f
1 parent 6cca0c4
commit 727819f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/docs/notes/2.24.x.md b/docs/notes/2.24.x.md
@@ -42,6 +42,8 @@ Compression of class files into a jar file is not reading or writing from the re
 
 Fixed a coursier fetch wrapper script bug on nixos.
 
+Fixed a jvm.sh script bug on nixos.
+
 #### Kotlin
 
 The kotlin linter, [ktlint](https://pinterest.github.io/ktlint/), has been updated to version 1.3.1.

diff --git a/src/python/pants/jvm/jdk_rules.py b/src/python/pants/jvm/jdk_rules.py
@@ -14,7 +14,7 @@
 from typing import ClassVar, Iterable, Mapping
 
 from pants.core.util_rules.environments import EnvironmentTarget
-from pants.core.util_rules.system_binaries import BashBinary
+from pants.core.util_rules.system_binaries import BashBinary, LnBinary
 from pants.engine.fs import CreateDigest, Digest, FileContent, FileDigest, MergeDigests
 from pants.engine.internals.selectors import Get
 from pants.engine.process import FallibleProcessResult, Process, ProcessCacheScope
@@ -201,6 +201,7 @@ async def prepare_jdk_environment(
     coursier: Coursier,
     nailgun_: Nailgun,
     bash: BashBinary,
+    ln: LnBinary,
     request: JdkRequest,
     env_target: EnvironmentTarget,
 ) -> JdkEnvironment:
@@ -276,13 +277,14 @@ def prefixed(arg: str) -> str:
 
     # TODO: Locate `ln`.
     version_comment = "\n".join(f"# {line}" for line in java_version.splitlines())
+    ln_path = shlex.quote(ln.path)
     jdk_preparation_script = textwrap.dedent(  # noqa: PNT20
         f"""\
         # pants javac script using Coursier {coursier_jdk_option}. `java -version`:"
         {version_comment}
         set -eu
 
-        /bin/ln -s "$({java_home_command})" "${{PANTS_INTERNAL_ABSOLUTE_PREFIX}}{JdkEnvironment.java_home}"
+        {ln_path} -s "$({java_home_command})" "${{PANTS_INTERNAL_ABSOLUTE_PREFIX}}{JdkEnvironment.java_home}"
         exec "$@"
         """
     )