Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-05-19 14:31:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/Ghidra_12.1'

Browse Source
This commit is contained in:
Ryan Kurtz
2026-04-15 05:54:18 -04:00
parent 25e99e298c 56d072f13b
commit 9aa147cacd
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Features/PyGhidra/src/main/py/src/pyghidra/launcher.py
+1 -1
View File
@@ -319,7 +319,7 @@ class PyGhidraLauncher:
# NOTE: shutils.which() is not enough...macOS puts a stub java on the PATH which
# will prevent that from working as expected, so you have to actually run it.
java_cmd = 'java'
if not shutil.which(java_cmd) or subprocess.run([java_cmd, "-version"]).returncode != 0:
if not shutil.which(java_cmd) or subprocess.run([java_cmd, "-version"], stderr=subprocess.DEVNULL).returncode != 0:
java_home_dir = os.environ.get('JAVA_HOME')
if java_home_dir and os.path.isdir(java_home_dir):
java_cmd = java_home_dir + "/bin/java"