Commit 95731ac4 authored by Ivan Migalev's avatar Ivan Migalev Committed by intellij-monorepo-bot
Browse files

Fix IDEA-254793: quote the variables in the startup script

GitOrigin-RevId: 8ed131d85b11ff310100d0aabddc1f6e9e001770
parent da9afbc7
Showing with 25 additions and 25 deletions
+25 -25
......@@ -164,10 +164,10 @@ final class WindowsDistributionBuilder extends OsSpecificDistributionBuilder {
String scriptName = "${baseName}.bat"
String vmOptionsFileName = "${baseName}%BITS%.exe"
String classPath = "SET CLASS_PATH=%IDE_HOME%\\lib\\${buildContext.bootClassPathJarNames[0]}\n"
classPath += buildContext.bootClassPathJarNames[1..-1].collect { "SET CLASS_PATH=%CLASS_PATH%;%IDE_HOME%\\lib\\$it" }.join("\n")
String classPath = "SET \"CLASS_PATH=%IDE_HOME%\\lib\\${buildContext.bootClassPathJarNames[0]}\"\n"
classPath += buildContext.bootClassPathJarNames[1..-1].collect { "SET \"CLASS_PATH=%CLASS_PATH%;%IDE_HOME%\\lib\\$it\"" }.join("\n")
if (buildContext.productProperties.toolsJarRequired) {
classPath += "\nSET CLASS_PATH=%CLASS_PATH%;%JDK%\\lib\\tools.jar"
classPath += "\nSET \"CLASS_PATH=%CLASS_PATH%;%JDK%\\lib\\tools.jar\""
}
buildContext.ant.copy(todir: distBinDir.toString()) {
......
......@@ -7,8 +7,8 @@
:: ---------------------------------------------------------------------
:: Ensure IDE_HOME points to the directory where the IDE is installed.
:: ---------------------------------------------------------------------
SET IDE_BIN_DIR=%~dp0
FOR /F "delims=" %%i in ("%IDE_BIN_DIR%\..") DO SET IDE_HOME=%%~fi
SET "IDE_BIN_DIR=%~dp0"
FOR /F "delims=" %%i in ("%IDE_BIN_DIR%\..") DO SET "IDE_HOME=%%~fi"
:: ---------------------------------------------------------------------
:: Locate a JRE installation directory which will be used to run the IDE.
......@@ -21,9 +21,9 @@ IF NOT "%@@product_uc@@_JDK%" == "" (
)
SET BITS=64
SET _USER_JRE64_FILE=%APPDATA%\@@product_vendor@@\@@system_selector@@\@@vm_options@@.jdk
SET "_USER_JRE64_FILE=%APPDATA%\@@product_vendor@@\@@system_selector@@\@@vm_options@@.jdk"
SET BITS=
SET _USER_JRE_FILE=%APPDATA%\@@product_vendor@@\@@system_selector@@\@@vm_options@@.jdk
SET "_USER_JRE_FILE=%APPDATA%\@@product_vendor@@\@@system_selector@@\@@vm_options@@.jdk"
IF "%JRE%" == "" (
SET _JRE_CANDIDATE=
IF EXIST "%_USER_JRE64_FILE%" (
......@@ -33,22 +33,22 @@ IF "%JRE%" == "" (
)
)
IF "%JRE%" == "" (
IF NOT "%_JRE_CANDIDATE%" == "" IF EXIST "%_JRE_CANDIDATE%" SET JRE=%_JRE_CANDIDATE%
IF NOT "%_JRE_CANDIDATE%" == "" IF EXIST "%_JRE_CANDIDATE%" SET "JRE=%_JRE_CANDIDATE%"
)
IF "%JRE%" == "" (
IF "%PROCESSOR_ARCHITECTURE%" == "AMD64" IF EXIST "%IDE_HOME%\jbr" SET JRE=%IDE_HOME%\jbr
IF "%PROCESSOR_ARCHITECTURE%" == "AMD64" IF EXIST "%IDE_HOME%\jbr" SET "JRE=%IDE_HOME%\jbr"
)
IF "%JRE%" == "" (
IF EXIST "%JDK_HOME%" (
SET JRE=%JDK_HOME%
SET "JRE=%JDK_HOME%"
) ELSE IF EXIST "%JAVA_HOME%" (
SET JRE=%JAVA_HOME%
SET "JRE=%JAVA_HOME%"
)
)
SET JAVA_EXE=%JRE%\bin\java.exe
SET "JAVA_EXE=%JRE%\bin\java.exe"
IF NOT EXIST "%JAVA_EXE%" (
ECHO ERROR: cannot start @@product_full@@.
ECHO No JRE found. Please make sure @@product_uc@@_JDK, JDK_HOME, or JAVA_HOME point to a valid JRE installation.
......@@ -65,41 +65,41 @@ SET VM_OPTIONS_FILE=
SET USER_VM_OPTIONS_FILE=
IF NOT "%@@product_uc@@_VM_OPTIONS%" == "" (
:: 1. %<IDE_NAME>_VM_OPTIONS%
IF EXIST "%@@product_uc@@_VM_OPTIONS%" SET VM_OPTIONS_FILE=%@@product_uc@@_VM_OPTIONS%
IF EXIST "%@@product_uc@@_VM_OPTIONS%" SET "VM_OPTIONS_FILE=%@@product_uc@@_VM_OPTIONS%"
)
IF "%VM_OPTIONS_FILE%" == "" (
:: 2. <IDE_HOME>.vmoptions || <IDE_HOME>\bin\<exe_name>.vmoptions + <IDE_HOME>.vmoptions (Toolbox)
IF EXIST "%IDE_HOME%.vmoptions" (
SET VM_OPTIONS_FILE=%IDE_HOME%.vmoptions
SET "VM_OPTIONS_FILE=%IDE_HOME%.vmoptions"
FINDSTR /B /C:"-ea" "%IDE_HOME%.vmoptions" > NUL
IF ERRORLEVEL 1 IF EXIST "%IDE_BIN_DIR%\@@vm_options@@.vmoptions" (
:: partial - prepend with default options
SET VM_OPTIONS_FILE=%IDE_BIN_DIR%\@@vm_options@@.vmoptions
SET USER_VM_OPTIONS_FILE=%IDE_HOME%.vmoptions
SET "VM_OPTIONS_FILE=%IDE_BIN_DIR%\@@vm_options@@.vmoptions"
SET "USER_VM_OPTIONS_FILE=%IDE_HOME%.vmoptions"
)
)
)
IF "%VM_OPTIONS_FILE%" == "" (
:: 3. <config_directory>\<exe_name>.vmoptions
IF EXIST "%APPDATA%\@@product_vendor@@\@@system_selector@@\@@vm_options@@.vmoptions" (
SET VM_OPTIONS_FILE=%APPDATA%\@@product_vendor@@\@@system_selector@@\@@vm_options@@.vmoptions
SET "VM_OPTIONS_FILE=%APPDATA%\@@product_vendor@@\@@system_selector@@\@@vm_options@@.vmoptions"
)
)
IF "%VM_OPTIONS_FILE%" == "" (
:: 4. <IDE_HOME>\bin\[win\]<exe_name>.vmoptions [+ <config_directory>\user.vmoptions]
IF EXIST "%IDE_BIN_DIR%\@@vm_options@@.vmoptions" (
SET VM_OPTIONS_FILE=%IDE_BIN_DIR%\@@vm_options@@.vmoptions
SET "VM_OPTIONS_FILE=%IDE_BIN_DIR%\@@vm_options@@.vmoptions"
) ELSE IF EXIST "%IDE_BIN_DIR%\win\@@vm_options@@.vmoptions" (
SET VM_OPTIONS_FILE=%IDE_BIN_DIR%\win\@@vm_options@@.vmoptions
SET "VM_OPTIONS_FILE=%IDE_BIN_DIR%\win\@@vm_options@@.vmoptions"
)
IF EXIST "%APPDATA%\@@product_vendor@@\@@system_selector@@\user.vmoptions" (
SET USER_VM_OPTIONS_FILE=%APPDATA%\@@product_vendor@@\@@system_selector@@\user.vmoptions
SET "USER_VM_OPTIONS_FILE=%APPDATA%\@@product_vendor@@\@@system_selector@@\user.vmoptions"
)
)
SET ACC=
IF "%VM_OPTIONS_FILE%" == "" IF NOT "%USER_VM_OPTIONS_FILE%" == "" (
SET VM_OPTIONS_FILE=%USER_VM_OPTIONS_FILE%
SET "VM_OPTIONS_FILE=%USER_VM_OPTIONS_FILE%"
SET USER_VM_OPTIONS_FILE=
)
IF "%VM_OPTIONS_FILE%" == "" (
......@@ -117,7 +117,7 @@ IF "%VM_OPTIONS_FILE%" == "" (
)
@@class_path@@
IF NOT "%@@product_uc@@_CLASS_PATH%" == "" SET CLASS_PATH=%CLASS_PATH%;%@@product_uc@@_CLASS_PATH%
IF NOT "%@@product_uc@@_CLASS_PATH%" == "" SET "CLASS_PATH=%CLASS_PATH%;%@@product_uc@@_CLASS_PATH%"
:: ---------------------------------------------------------------------
:: Run the IDE.
......
......@@ -4,5 +4,5 @@
:: @@product_full@@ formatting script.
::----------------------------------------------------------------------
SET IDE_BIN_DIR=%~dp0
SET "IDE_BIN_DIR=%~dp0"
CALL "%IDE_BIN_DIR%\@@script_name@@" format %*
......@@ -6,5 +6,5 @@
SET DEFAULT_PROJECT_PATH=%CD%
SET IDE_BIN_DIR=%~dp0
SET "IDE_BIN_DIR=%~dp0"
CALL "%IDE_BIN_DIR%\@@script_name@@" inspect %*
......@@ -4,5 +4,5 @@
:: @@product_full@@ LightEdit mode script.
::----------------------------------------------------------------------
SET IDE_BIN_DIR=%~dp0
SET "IDE_BIN_DIR=%~dp0"
CALL "%IDE_BIN_DIR%\@@script_name@@" -e %*
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment