mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-07-30 07:18:37 -09:00
Code Issues Packages Projects Releases Wiki Activity

GP-0: Fixing PyGhidra application name on Linux, and a couple of other

Browse Source 
PyGhidra tweaks (Closes #8362)
This commit is contained in:
Ryan Kurtz
2026-07-24 12:28:49 -04:00
parent 1014eb099c
commit 817766af27
4 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Ghidra/Features/PyGhidra/src/main/py/README.md
View File

@@ -575,6 +575,7 @@ __3.2.0__
* PyGhidra now depends on `JPype >=1.5.2, != 1.6.0, != 1.7.0`. * PyGhidra now depends on `JPype >=1.5.2, != 1.6.0, != 1.7.0`.
* Using `typing_extensions` to properly deprecate [`pyghidra.open_program()`](#pyghidraopen_program) * Using `typing_extensions` to properly deprecate [`pyghidra.open_program()`](#pyghidraopen_program)
and [`pyghidra.run_script()`](#pyghidrarun_script). and [`pyghidra.run_script()`](#pyghidrarun_script).
* Fixed the PyGhidra WM_CLASS/application name on Linux (requires Ghidra 12.2 or later).
__3.1.0__ __3.1.0__
* PyGhidra will now, by default, restore `sys.modules` to its prior state after a PyGhidra script is * PyGhidra will now, by default, restore `sys.modules` to its prior state after a PyGhidra script is

8
Ghidra/Features/PyGhidra/src/main/py/src/pyghidra/gui.py
View File

@@ -21,7 +21,7 @@ import platform
import sys import sys
import traceback import traceback
from typing import List, NoReturn from typing import List, NoReturn
import warnings from typing_extensions import deprecated
import pyghidra import pyghidra
@@ -153,11 +153,7 @@ def gui(install_dir: Path = None, vm_args: List[str] = None):
launcher.vm_args += vm_args launcher.vm_args += vm_args
launcher.start() launcher.start()
@deprecated("get_current_interpreter has been moved. Please use pyghidra.get_current_interpreter.")
def get_current_interpreter(): def get_current_interpreter():
warnings.warn(
"get_current_interpreter has been moved. Please use pyghidra.get_current_interpreter",
DeprecationWarning
)
return pyghidra.get_current_interpreter() return pyghidra.get_current_interpreter()

4
Ghidra/Features/PyGhidra/src/main/py/src/pyghidra/launcher.py
View File

@@ -746,6 +746,10 @@ class GuiPyGhidraLauncher(PyGhidraLauncher):
stdout = _PyGhidraStdOut(sys.stdout) stdout = _PyGhidraStdOut(sys.stdout)
stderr = _PyGhidraStdOut(sys.stderr) stderr = _PyGhidraStdOut(sys.stderr)
with contextlib.redirect_stdout(stdout), contextlib.redirect_stderr(stderr): with contextlib.redirect_stdout(stdout), contextlib.redirect_stderr(stderr):
try:
Ghidra.setLinuxApplicationName()
except AttributeError:
pass # Ghidra 12.2 and later
Thread(lambda: Ghidra.main(["ghidra.GhidraRun", *self.args])).start() Thread(lambda: Ghidra.main(["ghidra.GhidraRun", *self.args])).start()
is_exiting = threading.Event() is_exiting = threading.Event()
Runtime.getRuntime().addShutdownHook(Thread(is_exiting.set)) Runtime.getRuntime().addShutdownHook(Thread(is_exiting.set))

4
Ghidra/Features/PyGhidra/src/main/py/src/pyghidra/script.py
View File

@@ -280,14 +280,14 @@ def get_current_interpreter():
try: try:
from ghidra.util import SystemUtilities from ghidra.util import SystemUtilities
from ghidra.framework.main import AppInfo from ghidra.framework.main import AppInfo
from ghidra.pyghidra import PyGhidraScriptProvider
global _headless_interpreter global _headless_interpreter
if SystemUtilities.isInHeadlessMode(): if SystemUtilities.isInHeadlessMode():
if _headless_interpreter is None: if _headless_interpreter is None:
# one hasn't been created yet so make one now # one hasn't been created yet so make one now
PyGhidraScriptProvider = JClass("ghidra.pyghidra.PyGhidraScriptProvider") _headless_interpreter = PyGhidraScriptProvider().getScriptInstance(None, None) # type: ignore
_headless_interpreter = PyGhidraScriptProvider.PyGhidraHeadlessScript()
return _headless_interpreter return _headless_interpreter
project = AppInfo.getActiveProject() project = AppInfo.getActiveProject()