From 292cbf1d49482c2d191b9bb5c315d570e2c592dd Mon Sep 17 00:00:00 2001 From: Nicolas Adment <39568358+nadment@users.noreply.github.com> Date: Wed, 12 Jun 2024 16:47:57 +0200 Subject: [PATCH] Fix CLI commands on Windows when folder variables contain spaces #3686 --- assemblies/static/src/main/resources/hop-conf.bat | 8 ++++---- assemblies/static/src/main/resources/hop-encrypt.bat | 8 ++++---- assemblies/static/src/main/resources/hop-gui.bat | 8 ++++---- assemblies/static/src/main/resources/hop-import.bat | 8 ++++---- assemblies/static/src/main/resources/hop-run.bat | 8 ++++---- assemblies/static/src/main/resources/hop-search.bat | 8 ++++---- assemblies/static/src/main/resources/hop-server.bat | 8 ++++---- assemblies/static/src/main/resources/hop-translator.bat | 8 ++++---- 8 files changed, 32 insertions(+), 32 deletions(-) diff --git a/assemblies/static/src/main/resources/hop-conf.bat b/assemblies/static/src/main/resources/hop-conf.bat index f7e7be1cec0..091b552bdcc 100644 --- a/assemblies/static/src/main/resources/hop-conf.bat +++ b/assemblies/static/src/main/resources/hop-conf.bat @@ -48,18 +48,18 @@ set HOP_OPTIONS=%HOP_OPTIONS% -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:t REM Pass HOP variables if they're set. if not "%HOP_AUDIT_FOLDER%"=="" ( - set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_AUDIT_FOLDER=%HOP_AUDIT_FOLDER% + set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_AUDIT_FOLDER="%HOP_AUDIT_FOLDER%" ) else ( set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_AUDIT_FOLDER=.\audit ) if not "%HOP_CONFIG_FOLDER%"=="" ( - set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_CONFIG_FOLDER=%HOP_CONFIG_FOLDER% + set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_CONFIG_FOLDER="%HOP_CONFIG_FOLDER%" ) if not "%HOP_SHARED_JDBC_FOLDERS%"=="" ( - set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_SHARED_JDBC_FOLDERS=%HOP_SHARED_JDBC_FOLDERS% + set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_SHARED_JDBC_FOLDERS="%HOP_SHARED_JDBC_FOLDERS%" ) if not "%HOP_PLUGIN_BASE_FOLDERS%"=="" ( - set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_PLUGIN_BASE_FOLDERS=%HOP_PLUGIN_BASE_FOLDERS% + set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_PLUGIN_BASE_FOLDERS="%HOP_PLUGIN_BASE_FOLDERS%" ) if not "%HOP_PASSWORD_ENCODER_PLUGIN%"=="" ( set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_PASSWORD_ENCODER_PLUGIN=%HOP_PASSWORD_ENCODER_PLUGIN% diff --git a/assemblies/static/src/main/resources/hop-encrypt.bat b/assemblies/static/src/main/resources/hop-encrypt.bat index 50fda0b7ffa..24b644fa437 100644 --- a/assemblies/static/src/main/resources/hop-encrypt.bat +++ b/assemblies/static/src/main/resources/hop-encrypt.bat @@ -48,18 +48,18 @@ set HOP_OPTIONS=%HOP_OPTIONS% -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:t REM Pass HOP variables if they're set. if not "%HOP_AUDIT_FOLDER%"=="" ( - set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_AUDIT_FOLDER=%HOP_AUDIT_FOLDER% + set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_AUDIT_FOLDER="%HOP_AUDIT_FOLDER%" ) else ( set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_AUDIT_FOLDER=.\audit ) if not "%HOP_CONFIG_FOLDER%"=="" ( - set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_CONFIG_FOLDER=%HOP_CONFIG_FOLDER% + set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_CONFIG_FOLDER="%HOP_CONFIG_FOLDER%" ) if not "%HOP_SHARED_JDBC_FOLDERS%"=="" ( - set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_SHARED_JDBC_FOLDERS=%HOP_SHARED_JDBC_FOLDERS% + set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_SHARED_JDBC_FOLDERS="%HOP_SHARED_JDBC_FOLDERS%" ) if not "%HOP_PLUGIN_BASE_FOLDERS%"=="" ( - set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_PLUGIN_BASE_FOLDERS=%HOP_PLUGIN_BASE_FOLDERS% + set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_PLUGIN_BASE_FOLDERS="%HOP_PLUGIN_BASE_FOLDERS%" ) if not "%HOP_PASSWORD_ENCODER_PLUGIN%"=="" ( set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_PASSWORD_ENCODER_PLUGIN=%HOP_PASSWORD_ENCODER_PLUGIN% diff --git a/assemblies/static/src/main/resources/hop-gui.bat b/assemblies/static/src/main/resources/hop-gui.bat index 5d71a578359..780e0793530 100755 --- a/assemblies/static/src/main/resources/hop-gui.bat +++ b/assemblies/static/src/main/resources/hop-gui.bat @@ -69,18 +69,18 @@ set HOP_OPTIONS=%HOP_OPTIONS% -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:t REM Pass HOP variables if they're set. if not "%HOP_AUDIT_FOLDER%"=="" ( - set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_AUDIT_FOLDER=%HOP_AUDIT_FOLDER% + set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_AUDIT_FOLDER="%HOP_AUDIT_FOLDER%" ) else ( set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_AUDIT_FOLDER=.\audit ) if not "%HOP_CONFIG_FOLDER%"=="" ( - set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_CONFIG_FOLDER=%HOP_CONFIG_FOLDER% + set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_CONFIG_FOLDER="%HOP_CONFIG_FOLDER%" ) if not "%HOP_SHARED_JDBC_FOLDERS%"=="" ( - set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_SHARED_JDBC_FOLDERS=%HOP_SHARED_JDBC_FOLDERS% + set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_SHARED_JDBC_FOLDERS="%HOP_SHARED_JDBC_FOLDERS%" ) if not "%HOP_PLUGIN_BASE_FOLDERS%"=="" ( - set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_PLUGIN_BASE_FOLDERS=%HOP_PLUGIN_BASE_FOLDERS% + set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_PLUGIN_BASE_FOLDERS="%HOP_PLUGIN_BASE_FOLDERS%" ) if not "%HOP_PASSWORD_ENCODER_PLUGIN%"=="" ( set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_PASSWORD_ENCODER_PLUGIN=%HOP_PASSWORD_ENCODER_PLUGIN% diff --git a/assemblies/static/src/main/resources/hop-import.bat b/assemblies/static/src/main/resources/hop-import.bat index f9993389b6f..990f573ccd0 100644 --- a/assemblies/static/src/main/resources/hop-import.bat +++ b/assemblies/static/src/main/resources/hop-import.bat @@ -48,18 +48,18 @@ set HOP_OPTIONS=%HOP_OPTIONS% -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:t REM Pass HOP variables if they're set. if not "%HOP_AUDIT_FOLDER%"=="" ( - set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_AUDIT_FOLDER=%HOP_AUDIT_FOLDER% + set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_AUDIT_FOLDER="%HOP_AUDIT_FOLDER%" ) else ( set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_AUDIT_FOLDER=.\audit ) if not "%HOP_CONFIG_FOLDER%"=="" ( - set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_CONFIG_FOLDER=%HOP_CONFIG_FOLDER% + set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_CONFIG_FOLDER="%HOP_CONFIG_FOLDER%" ) if not "%HOP_SHARED_JDBC_FOLDERS%"=="" ( - set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_SHARED_JDBC_FOLDERS=%HOP_SHARED_JDBC_FOLDERS% + set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_SHARED_JDBC_FOLDERS="%HOP_SHARED_JDBC_FOLDERS%" ) if not "%HOP_PLUGIN_BASE_FOLDERS%"=="" ( - set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_PLUGIN_BASE_FOLDERS=%HOP_PLUGIN_BASE_FOLDERS% + set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_PLUGIN_BASE_FOLDERS="%HOP_PLUGIN_BASE_FOLDERS%" ) if not "%HOP_PASSWORD_ENCODER_PLUGIN%"=="" ( set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_PASSWORD_ENCODER_PLUGIN=%HOP_PASSWORD_ENCODER_PLUGIN% diff --git a/assemblies/static/src/main/resources/hop-run.bat b/assemblies/static/src/main/resources/hop-run.bat index 7e72e0d712b..858bf87d2da 100755 --- a/assemblies/static/src/main/resources/hop-run.bat +++ b/assemblies/static/src/main/resources/hop-run.bat @@ -68,18 +68,18 @@ set HOP_OPTIONS=%HOP_OPTIONS% -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:t REM Pass HOP variables if they're set. if not "%HOP_AUDIT_FOLDER%"=="" ( - set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_AUDIT_FOLDER=%HOP_AUDIT_FOLDER% + set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_AUDIT_FOLDER="%HOP_AUDIT_FOLDER%" ) else ( set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_AUDIT_FOLDER=.\audit ) if not "%HOP_CONFIG_FOLDER%"=="" ( - set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_CONFIG_FOLDER=%HOP_CONFIG_FOLDER% + set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_CONFIG_FOLDER="%HOP_CONFIG_FOLDER%" ) if not "%HOP_SHARED_JDBC_FOLDERS%"=="" ( - set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_SHARED_JDBC_FOLDERS=%HOP_SHARED_JDBC_FOLDERS% + set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_SHARED_JDBC_FOLDERS="%HOP_SHARED_JDBC_FOLDERS%" ) if not "%HOP_PLUGIN_BASE_FOLDERS%"=="" ( - set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_PLUGIN_BASE_FOLDERS=%HOP_PLUGIN_BASE_FOLDERS% + set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_PLUGIN_BASE_FOLDERS="%HOP_PLUGIN_BASE_FOLDERS%" ) if not "%HOP_PASSWORD_ENCODER_PLUGIN%"=="" ( set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_PASSWORD_ENCODER_PLUGIN=%HOP_PASSWORD_ENCODER_PLUGIN% diff --git a/assemblies/static/src/main/resources/hop-search.bat b/assemblies/static/src/main/resources/hop-search.bat index cb0af690a02..a69802b5034 100644 --- a/assemblies/static/src/main/resources/hop-search.bat +++ b/assemblies/static/src/main/resources/hop-search.bat @@ -48,18 +48,18 @@ set HOP_OPTIONS=%HOP_OPTIONS% -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:t REM Pass HOP variables if they're set. if not "%HOP_AUDIT_FOLDER%"=="" ( - set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_AUDIT_FOLDER=%HOP_AUDIT_FOLDER% + set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_AUDIT_FOLDER="%HOP_AUDIT_FOLDER%" ) else ( set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_AUDIT_FOLDER=.\audit ) if not "%HOP_CONFIG_FOLDER%"=="" ( - set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_CONFIG_FOLDER=%HOP_CONFIG_FOLDER% + set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_CONFIG_FOLDER="%HOP_CONFIG_FOLDER%" ) if not "%HOP_SHARED_JDBC_FOLDERS%"=="" ( - set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_SHARED_JDBC_FOLDERS=%HOP_SHARED_JDBC_FOLDERS% + set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_SHARED_JDBC_FOLDERS="%HOP_SHARED_JDBC_FOLDERS%" ) if not "%HOP_PLUGIN_BASE_FOLDERS%"=="" ( - set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_PLUGIN_BASE_FOLDERS=%HOP_PLUGIN_BASE_FOLDERS% + set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_PLUGIN_BASE_FOLDERS="%HOP_PLUGIN_BASE_FOLDERS%" ) if not "%HOP_PASSWORD_ENCODER_PLUGIN%"=="" ( set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_PASSWORD_ENCODER_PLUGIN=%HOP_PASSWORD_ENCODER_PLUGIN% diff --git a/assemblies/static/src/main/resources/hop-server.bat b/assemblies/static/src/main/resources/hop-server.bat index cd8bc5cdbbc..57d05dbdb7e 100644 --- a/assemblies/static/src/main/resources/hop-server.bat +++ b/assemblies/static/src/main/resources/hop-server.bat @@ -51,18 +51,18 @@ set HOP_OPTIONS=%HOP_OPTIONS% -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:t REM Pass HOP variables if they're set. if not "%HOP_AUDIT_FOLDER%"=="" ( - set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_AUDIT_FOLDER=%HOP_AUDIT_FOLDER% + set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_AUDIT_FOLDER="%HOP_AUDIT_FOLDER%" ) else ( set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_AUDIT_FOLDER=.\audit ) if not "%HOP_CONFIG_FOLDER%"=="" ( - set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_CONFIG_FOLDER=%HOP_CONFIG_FOLDER% + set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_CONFIG_FOLDER="%HOP_CONFIG_FOLDER%" ) if not "%HOP_SHARED_JDBC_FOLDERS%"=="" ( - set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_SHARED_JDBC_FOLDERS=%HOP_SHARED_JDBC_FOLDERS% + set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_SHARED_JDBC_FOLDERS="%HOP_SHARED_JDBC_FOLDERS%" ) if not "%HOP_PLUGIN_BASE_FOLDERS%"=="" ( - set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_PLUGIN_BASE_FOLDERS=%HOP_PLUGIN_BASE_FOLDERS% + set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_PLUGIN_BASE_FOLDERS="%HOP_PLUGIN_BASE_FOLDERS%" ) if not "%HOP_PASSWORD_ENCODER_PLUGIN%"=="" ( set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_PASSWORD_ENCODER_PLUGIN=%HOP_PASSWORD_ENCODER_PLUGIN% diff --git a/assemblies/static/src/main/resources/hop-translator.bat b/assemblies/static/src/main/resources/hop-translator.bat index e3247e9ec38..89d22f2b1f9 100644 --- a/assemblies/static/src/main/resources/hop-translator.bat +++ b/assemblies/static/src/main/resources/hop-translator.bat @@ -48,18 +48,18 @@ set HOP_OPTIONS=%HOP_OPTIONS% -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:t REM Pass HOP variables if they're set. if not "%HOP_AUDIT_FOLDER%"=="" ( - set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_AUDIT_FOLDER=%HOP_AUDIT_FOLDER% + set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_AUDIT_FOLDER="%HOP_AUDIT_FOLDER%" ) else ( set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_AUDIT_FOLDER=.\audit ) if not "%HOP_CONFIG_FOLDER%"=="" ( - set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_CONFIG_FOLDER=%HOP_CONFIG_FOLDER% + set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_CONFIG_FOLDER="%HOP_CONFIG_FOLDER%" ) if not "%HOP_SHARED_JDBC_FOLDERS%"=="" ( - set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_SHARED_JDBC_FOLDERS=%HOP_SHARED_JDBC_FOLDERS% + set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_SHARED_JDBC_FOLDERS="%HOP_SHARED_JDBC_FOLDERS%" ) if not "%HOP_PLUGIN_BASE_FOLDERS%"=="" ( - set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_PLUGIN_BASE_FOLDERS=%HOP_PLUGIN_BASE_FOLDERS% + set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_PLUGIN_BASE_FOLDERS="%HOP_PLUGIN_BASE_FOLDERS%" ) if not "%HOP_PASSWORD_ENCODER_PLUGIN%"=="" ( set HOP_OPTIONS=%HOP_OPTIONS% -DHOP_PASSWORD_ENCODER_PLUGIN=%HOP_PASSWORD_ENCODER_PLUGIN%