github/ghidra
1
1
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-01-09 22:17:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

GP-693: Fixed additional issues with Ghidra and its supporting launch

Browse Source 
scripts not being able to run correctly on Windows when an ampersand was
in the path. Also fixed an issue with svrAdmin.bat and
buildGhidraJar.bat not working if the Ghidra path contained a space.
This commit is contained in:
Ryan Kurtz
2021-02-19 10:46:20 -05:00
parent 61096c5fdf
commit 95b37d2ce1
10 changed files with 47 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Ghidra/RuntimeScripts/Windows/server/svrAdmin.bat
View File

@@ -31,18 +31,18 @@ set MAXMEM=128M
:: '% ~' dereferences the value in param 0
:: 'd' - drive
:: 'p' - path (without filename)
set SCRIPT_DIR=%~dp0
set "SCRIPT_DIR=%~dp0"
:: Production Environment
set CONFIG=%SCRIPT_DIR%.\server.conf
set "CONFIG=%SCRIPT_DIR%.\server.conf"
if exist "%CONFIG%" goto continue
:: Development Environment
set CONFIG=%SCRIPT_DIR%..\..\Common\server\server.conf
set "CONFIG=%SCRIPT_DIR%..\..\Common\server\server.conf"
:continue
set VMARGS=-DUserAdmin.invocation="%0" -DUserAdmin.config="%CONFIG%"
set VMARGS=-DUserAdmin.invocation="%0"
call "%~dp0\..\support\launch.bat" fg svrAdmin "%MAXMEM%" "%VMARGS%" ghidra.server.ServerAdmin %*
call "%~dp0\..\support\launch.bat" fg svrAdmin "%MAXMEM%" "%VMARGS%" ghidra.server.ServerAdmin "%CONFIG%" %*