From 308173a0fcacd365c83b891ad2aac4c1b853a211 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Thu, 13 Jan 2022 17:16:07 +0100
Subject: [PATCH] [core] Handle quotes correctly in designer.bat and other
 *.bat files

Fixes #3328
---
 docs/pages/release_notes.md                         | 2 ++
 pmd-dist/src/main/resources/scripts/ast-dump.bat    | 4 ++--
 pmd-dist/src/main/resources/scripts/bgastviewer.bat | 4 ++--
 pmd-dist/src/main/resources/scripts/cpd.bat         | 4 ++--
 pmd-dist/src/main/resources/scripts/cpdgui.bat      | 4 ++--
 pmd-dist/src/main/resources/scripts/designer.bat    | 8 ++++----
 pmd-dist/src/main/resources/scripts/designerold.bat | 4 ++--
 pmd-dist/src/main/resources/scripts/pmd.bat         | 4 ++--
 8 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md
index 953a3a05e16..479b9fc79ed 100644
--- a/docs/pages/release_notes.md
+++ b/docs/pages/release_notes.md
@@ -22,6 +22,8 @@ This is a {{ site.pmd.release_type }} release.
 
 ### Fixed Issues
 
+*   core
+    *   [#3328](https://github.com/pmd/pmd/issues/3328): \[core] designer.bat errors when JAVAFX_HOME contains spaces
 *   java-bestpractices
     *   [#3209](https://github.com/pmd/pmd/issues/3209): \[java] UnusedPrivateMethod false positive with static method and cast expression
     *   [#3468](https://github.com/pmd/pmd/issues/3468): \[java] UnusedPrivateMethod false positive when outer class calls private static method on inner class
diff --git a/pmd-dist/src/main/resources/scripts/ast-dump.bat b/pmd-dist/src/main/resources/scripts/ast-dump.bat
index e0cc6edf2f8..232a07590f1 100644
--- 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
index 56f460db486..00dea3c01a1 100644
--- 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
index dbdda1876a0..5731fa10897 100644
--- 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
index 38ce3ffba56..526dbba46ae 100755
--- 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
index b33e9af1953..bc3cbb9188b 100644
--- 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
index d41f2622025..de42c37f809 100644
--- 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
index 0a5d79e1294..b3b2c786998 100755
--- 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% %*