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

Fix #2176 removing both backslash from path

Browse Source 
As suggested #3121 squashed and rebased on brach Ghidra_10.0.
Thanks to @topia for fix a missing \
This commit is contained in:
Mirco Cailotto
2021-06-09 20:02:55 +02:00
committed by GitHub
parent 4be9db7356
commit c98e6fe3bb
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Ghidra/RuntimeScripts/Windows/support/launch.bat
View File

@@ -63,20 +63,20 @@ goto showUsage
:: ::
:: Production Environment :: Production Environment
:: ::
set "INSTALL_DIR=%SUPPORT_DIR%..\" set "INSTALL_DIR=%SUPPORT_DIR%.."
set "CPATH=%INSTALL_DIR%Ghidra\Framework\Utility\lib\Utility.jar" set "CPATH=%INSTALL_DIR%\Ghidra\Framework\Utility\lib\Utility.jar"
set "LS_CPATH=%SUPPORT_DIR%LaunchSupport.jar" set "LS_CPATH=%SUPPORT_DIR%\LaunchSupport.jar"
set "DEBUG_LOG4J=%SUPPORT_DIR%debug.log4j.xml" set "DEBUG_LOG4J=%SUPPORT_DIR%\debug.log4j.xml"
if exist "%INSTALL_DIR%Ghidra" goto continue2 if exist "%INSTALL_DIR%\Ghidra" goto continue2
:: ::
:: Development Environment :: Development Environment
:: ::
set "INSTALL_DIR=%INSTALL_DIR%..\..\..\" set "INSTALL_DIR=%INSTALL_DIR%\..\..\.."
set "CPATH=%INSTALL_DIR%Ghidra\Framework\Utility\bin\main" set "CPATH=%INSTALL_DIR%\Ghidra\Framework\Utility\bin\main"
set "LS_CPATH=%INSTALL_DIR%GhidraBuild\LaunchSupport\bin\main" set "LS_CPATH=%INSTALL_DIR%\GhidraBuild\LaunchSupport\bin\main"
set "DEBUG_LOG4J=%INSTALL_DIR%Ghidra\RuntimeScripts\Common\support\debug.log4j.xml" set "DEBUG_LOG4J=%INSTALL_DIR%\Ghidra\RuntimeScripts\Common\support\debug.log4j.xml"
if not exist "%LS_CPATH%" ( if not exist "%LS_CPATH%" (
echo Ghidra cannot launch in development mode because Eclipse has not compiled its class files. echo Ghidra cannot launch in development mode because Eclipse has not compiled its class files.
set ERRORLEVEL=1 set ERRORLEVEL=1
@@ -99,13 +99,13 @@ if not %ERRORLEVEL% == 0 (
:: Get the JDK that will be used to launch Ghidra :: Get the JDK that will be used to launch Ghidra
set JAVA_HOME= set JAVA_HOME=
for /f "delims=*" %%i in ('java -cp "%LS_CPATH%" LaunchSupport "%INSTALL_DIR%\" -jdk_home -save') do set JAVA_HOME=%%i for /f "delims=*" %%i in ('java -cp "%LS_CPATH%" LaunchSupport "%INSTALL_DIR%" -jdk_home -save') do set JAVA_HOME=%%i
if "%JAVA_HOME%" == "" ( if "%JAVA_HOME%" == "" (
:: No JDK has been setup yet. Let the user choose one. :: No JDK has been setup yet. Let the user choose one.
java -cp "%LS_CPATH%" LaunchSupport "%INSTALL_DIR%\" -jdk_home -ask java -cp "%LS_CPATH%" LaunchSupport "%INSTALL_DIR%" -jdk_home -ask
:: Now that the user chose one, try again to get the JDK that will be used to launch Ghidra :: Now that the user chose one, try again to get the JDK that will be used to launch Ghidra
for /f "delims=*" %%i in ('java -cp "%LS_CPATH%" LaunchSupport "%INSTALL_DIR%\" -jdk_home -save') do set JAVA_HOME=%%i for /f "delims=*" %%i in ('java -cp "%LS_CPATH%" LaunchSupport "%INSTALL_DIR%" -jdk_home -save') do set JAVA_HOME=%%i
if "!JAVA_HOME!" == "" ( if "!JAVA_HOME!" == "" (
echo. echo.
echo Failed to find a supported JDK. Please refer to the Ghidra Installation Guide's Troubleshooting section. echo Failed to find a supported JDK. Please refer to the Ghidra Installation Guide's Troubleshooting section.
@@ -116,7 +116,7 @@ if "%JAVA_HOME%" == "" (
set "JAVA_CMD=%JAVA_HOME%\bin\java" set "JAVA_CMD=%JAVA_HOME%\bin\java"
:: Get the configurable VM arguments from the launch properties :: Get the configurable VM arguments from the launch properties
for /f "delims=*" %%i in ('java -cp "%LS_CPATH%" LaunchSupport "%INSTALL_DIR%\" -vmargs') do set VMARG_LIST=%VMARG_LIST% %%i for /f "delims=*" %%i in ('java -cp "%LS_CPATH%" LaunchSupport "%INSTALL_DIR%" -vmargs') do set VMARG_LIST=%VMARG_LIST% %%i
:: Set Max Heap Size if specified :: Set Max Heap Size if specified
if not "%MAXMEM%"=="" ( if not "%MAXMEM%"=="" (