File tree Expand file tree Collapse file tree 3 files changed +4
-3
lines changed
GhidraBuild/LaunchSupport/src/main/java Expand file tree Collapse file tree 3 files changed +4
-3
lines changed Original file line number Diff line number Diff line change 145
145
JAVA_CMD=" ${JAVA_HOME} /bin/java"
146
146
147
147
# Get the configurable VM arguments from the launch properties
148
- while IFS= read -r line; do
148
+ while IFS=$' \r\n ' read -r line; do
149
149
VMARGS_FROM_LAUNCH_PROPS+=(" $line " )
150
150
done < <( java -cp " ${LS_CPATH} " LaunchSupport " ${INSTALL_DIR} " -vmargs)
151
151
Original file line number Diff line number Diff line change @@ -129,7 +129,7 @@ if "%JAVA_HOME%" == "" (
129
129
set " JAVA_CMD = %JAVA_HOME% \bin\java"
130
130
131
131
:: Get the configurable VM arguments from the launch properties
132
- for /f " delims=*" %%i in ('java -cp " %LS_CPATH% " LaunchSupport " %INSTALL_DIR% " -vmargs') do set VMARG_LIST = % VMARG_LIST% %%i
132
+ for /f " delims=*" %%i in ('java -cp " %LS_CPATH% " LaunchSupport " %INSTALL_DIR% " -vmargs') do set VMARG_LIST = ! VMARG_LIST! %%i
133
133
134
134
:: Set Max Heap Size if specified
135
135
if not " %MAXMEM% " == " " (
Original file line number Diff line number Diff line change @@ -291,7 +291,8 @@ private static int handleVmArgs(JavaConfig javaConfig) {
291
291
return EXIT_FAILURE ;
292
292
}
293
293
294
- javaConfig .getLaunchProperties ().getVmArgList ().forEach (arg -> System .out .println (arg ));
294
+ // Force newline style to make cross-platform parsing consistent
295
+ javaConfig .getLaunchProperties ().getVmArgList ().forEach (e -> System .out .print (e + "\r \n " ));
295
296
return EXIT_SUCCESS ;
296
297
}
297
298
}
You can’t perform that action at this time.
0 commit comments