Merge pull request #3726 from adangel:issue-3328-designer-bat

[core] Handle quotes correctly in designer.bat and other *.bat files #3726 * pr-3726: [core] Handle quotes correctly in designer.bat and other *.bat files
pmd · Jan 27, 2022 · 93811d3 · 93811d3
2 parents fb913bd + 308173a
commit 93811d3
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 16 deletions.
diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md
@@ -41,6 +41,8 @@ not support all features of the latest EcmaScript standard.
 
 ### Fixed Issues
 
+*   core
+    *   [#3328](https://github.com/pmd/pmd/issues/3328): \[core] designer.bat errors when JAVAFX_HOME contains spaces
 *   java
     *   [#3698](https://github.com/pmd/pmd/issues/3698): \[java] Error resolving Symbol Table
 *   java-bestpractices

diff --git a/pmd-dist/src/main/resources/scripts/ast-dump.bat b/pmd-dist/src/main/resources/scripts/ast-dump.bat
@@ -1,6 +1,6 @@
 @echo off
-set TOPDIR=%~dp0..
+set TOPDIR="%~dp0.."
 set OPTS=
 set MAIN_CLASS=net.sourceforge.pmd.util.treeexport.TreeExportCli
 
-java %PMD_JAVA_OPTS% -classpath "%TOPDIR%\lib\*" %OPTS% %MAIN_CLASS% %*
+java %PMD_JAVA_OPTS% -classpath %TOPDIR%\lib\* %OPTS% %MAIN_CLASS% %*
diff --git a/pmd-dist/src/main/resources/scripts/bgastviewer.bat b/pmd-dist/src/main/resources/scripts/bgastviewer.bat
@@ -1,6 +1,6 @@
 @echo off
-set TOPDIR=%~dp0..
+set TOPDIR="%~dp0.."
 set OPTS=
 set MAIN_CLASS=net.sourceforge.pmd.util.viewer.Viewer
 
-java %PMD_JAVA_OPTS% -classpath "%TOPDIR%\lib\*" %OPTS% %MAIN_CLASS% %*
+java %PMD_JAVA_OPTS% -classpath %TOPDIR%\lib\* %OPTS% %MAIN_CLASS% %*
diff --git a/pmd-dist/src/main/resources/scripts/cpd.bat b/pmd-dist/src/main/resources/scripts/cpd.bat
@@ -1,6 +1,6 @@
 @echo off
-set TOPDIR=%~dp0..
+set TOPDIR="%~dp0.."
 set OPTS=
 set MAIN_CLASS=net.sourceforge.pmd.cpd.CPD
 
-java %PMD_JAVA_OPTS% -classpath "%TOPDIR%\lib\*" %OPTS% %MAIN_CLASS% %*
+java %PMD_JAVA_OPTS% -classpath %TOPDIR%\lib\* %OPTS% %MAIN_CLASS% %*
diff --git a/pmd-dist/src/main/resources/scripts/cpdgui.bat b/pmd-dist/src/main/resources/scripts/cpdgui.bat
@@ -1,6 +1,6 @@
 @echo off
-set TOPDIR=%~dp0..
+set TOPDIR="%~dp0.."
 set OPTS=
 set MAIN_CLASS=net.sourceforge.pmd.cpd.GUI
 
-java %PMD_JAVA_OPTS% -classpath "%TOPDIR%\lib\*" %OPTS% %MAIN_CLASS% %*
+java %PMD_JAVA_OPTS% -classpath %TOPDIR%\lib\* %OPTS% %MAIN_CLASS% %*
diff --git a/pmd-dist/src/main/resources/scripts/designer.bat b/pmd-dist/src/main/resources/scripts/designer.bat
@@ -1,5 +1,5 @@
 @echo off
-set TOPDIR=%~dp0..
+set TOPDIR="%~dp0.."
 set OPTS=
 set MAIN_CLASS=net.sourceforge.pmd.util.fxdesigner.DesignerStarter
 
@@ -42,10 +42,10 @@ if %_needjfxlib% EQU 1 (
         pause
         exit
     )
-    set "classpath=%TOPDIR%\lib\*;%JAVAFX_HOME%\lib\*"
+    set classpath=%TOPDIR%\lib\*;%JAVAFX_HOME%\lib\*
 ) else (
-    set "classpath=%TOPDIR%\lib\*"
+    set classpath=%TOPDIR%\lib\*
 )
 
 
-java %PMD_JAVA_OPTS% %jreopts% -classpath "%classpath%" %OPTS% %MAIN_CLASS% %*
+java %PMD_JAVA_OPTS% %jreopts% -classpath %classpath% %OPTS% %MAIN_CLASS% %*
diff --git a/pmd-dist/src/main/resources/scripts/designerold.bat b/pmd-dist/src/main/resources/scripts/designerold.bat
@@ -1,6 +1,6 @@
 @echo off
-set TOPDIR=%~dp0..
+set TOPDIR="%~dp0.."
 set OPTS=
 set MAIN_CLASS=net.sourceforge.pmd.util.designer.Designer
 
-java %PMD_JAVA_OPTS% -classpath "%TOPDIR%\lib\*" %OPTS% %MAIN_CLASS% %*
+java %PMD_JAVA_OPTS% -classpath %TOPDIR%\lib\* %OPTS% %MAIN_CLASS% %*
diff --git a/pmd-dist/src/main/resources/scripts/pmd.bat b/pmd-dist/src/main/resources/scripts/pmd.bat
@@ -1,6 +1,6 @@
 @echo off
-set TOPDIR=%~dp0..
+set TOPDIR="%~dp0.."
 set OPTS=
 set MAIN_CLASS=net.sourceforge.pmd.PMD
 
-java %PMD_JAVA_OPTS% -classpath "%TOPDIR%\lib\*" %OPTS% %MAIN_CLASS% %*
+java %PMD_JAVA_OPTS% -classpath %TOPDIR%\lib\* %OPTS% %MAIN_CLASS% %*