mirror of
https://github.com/NationalSecurityAgency/ghidra.git
synced 2026-05-26 19:33:44 +08:00
GP-1304: Removing illegal access to java.desktop/sun.awt.X11. Has side
effect of changing application name on Linux from "Ghidra" to "ghidra.Ghidra".
This commit is contained in:
@@ -74,7 +74,6 @@ VMARGS=--add-opens java.base/java.lang=ALL-UNNAMED
|
||||
VMARGS=--add-opens java.base/java.util=ALL-UNNAMED
|
||||
VMARGS=--add-opens java.base/java.net=ALL-UNNAMED
|
||||
VMARGS=--add-opens java.desktop/sun.awt.image=ALL-UNNAMED
|
||||
VMARGS_LINUX=--add-opens java.desktop/sun.awt.X11=ALL-UNNAMED
|
||||
|
||||
# Persistent cache directory used by the application. This directory will be used to store
|
||||
# persistent application caches for all users. The default location for Mac/Linux is the same as
|
||||
|
||||
@@ -180,7 +180,7 @@ else
|
||||
fi
|
||||
|
||||
if [ "${BACKGROUND}" = true ]; then
|
||||
eval "\"${JAVA_CMD}\" ${VMARG_LIST} -showversion -cp \"${CPATH}\" ghidra.GhidraLauncher ${CLASSNAME} ${ARGS[@]}" &>/dev/null &
|
||||
eval "\"${JAVA_CMD}\" ${VMARG_LIST} -showversion -cp \"${CPATH}\" ghidra.Ghidra ${CLASSNAME} ${ARGS[@]}" &>/dev/null &
|
||||
|
||||
# If our process dies immediately, output something so the user knows to run in debug mode.
|
||||
# Otherwise they'll never see any error output from background mode.
|
||||
@@ -193,7 +193,7 @@ if [ "${BACKGROUND}" = true ]; then
|
||||
fi
|
||||
exit 0
|
||||
else
|
||||
eval "\"${JAVA_CMD}\" ${VMARG_LIST} -showversion -cp \"${CPATH}\" ghidra.GhidraLauncher ${CLASSNAME} ${ARGS[@]}"
|
||||
eval "\"${JAVA_CMD}\" ${VMARG_LIST} -showversion -cp \"${CPATH}\" ghidra.Ghidra ${CLASSNAME} ${ARGS[@]}"
|
||||
exit $?
|
||||
fi
|
||||
|
||||
|
||||
@@ -170,7 +170,7 @@ exit /B 1
|
||||
|
||||
:continue3
|
||||
|
||||
set CMD_ARGS=%FORCE_JAVA_VERSION% %JAVA_USER_HOME_DIR_OVERRIDE% %VMARG_LIST% -cp "%CPATH%" ghidra.GhidraLauncher %CLASSNAME% %ARGS%
|
||||
set CMD_ARGS=%FORCE_JAVA_VERSION% %JAVA_USER_HOME_DIR_OVERRIDE% %VMARG_LIST% -cp "%CPATH%" ghidra.Ghidra %CLASSNAME% %ARGS%
|
||||
|
||||
if "%BACKGROUND%"=="y" (
|
||||
set JAVA_CMD=!JAVA_CMD!w
|
||||
|
||||
Reference in New Issue
Block a user