Skip to content

Commit 8e3a2cb

Browse files
committed
improve messaging
1 parent 12f0088 commit 8e3a2cb

1 file changed

Lines changed: 21 additions & 3 deletions

File tree

py5-resources/py5-module/src/py5_tools/tools/install_jdk.py

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,13 @@
3030
type=int,
3131
help="Java Version (must be 17 or greater, defaults to 21)",
3232
)
33+
parser.add_argument(
34+
"--jre",
35+
action="store_true",
36+
dest="jre",
37+
default=False,
38+
help="Install Java Runtime Environment (JRE) instead of Java Development Kit (JDK)",
39+
)
3340

3441

3542
def main():
@@ -45,6 +52,8 @@ def main():
4552
return
4653

4754
java_version = args.java_version
55+
jre = args.jre
56+
installing = "Java Runtime Environment" if jre else "Java Development Kit"
4857

4958
if java_version < 17:
5059
print(
@@ -53,10 +62,19 @@ def main():
5362
return
5463

5564
try:
56-
print(f"Installing Java Development Kit version {java_version}...")
57-
print(f"Java installed to {jdk.install(java_version)}")
65+
print(f"Installing {installing} version {java_version}...")
66+
print(
67+
f"{installing} version {java_version} installed to {jdk.install(java_version, jre=jre)}"
68+
)
5869
except jdk.JdkError as e:
59-
print(f"Failed to install Java: {e}", file=sys.stderr)
70+
print(
71+
f"Failed to install {installing} version {java_version}: {e}",
72+
file=sys.stderr,
73+
)
74+
print(
75+
"Make sure you have a working internet and that have not installed this version of Java already.",
76+
file=sys.stderr,
77+
)
6078

6179

6280
if __name__ == "__main__":

0 commit comments

Comments
 (0)