This is an automated email from the ASF dual-hosted git repository.
hansva pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hop.git
The following commit(s) were added to refs/heads/master by this push:
new b36ea7e614 HOP-2918 - parameters option in windows is not responding
as expected on Windows using CMD
new 3477e42906 Merge pull request #2922 from sramazzina/2918
b36ea7e614 is described below
commit b36ea7e614c17786bca5b1ad9367cac06bc21674
Author: sergio.ramazzina <[email protected]>
AuthorDate: Fri May 12 14:32:48 2023 +0200
HOP-2918 - parameters option in windows is not responding as expected on
Windows using CMD
---
assemblies/static/src/main/resources/hop-conf.bat | 13 ++++++-------
assemblies/static/src/main/resources/hop-encrypt.bat | 13 ++++++-------
assemblies/static/src/main/resources/hop-import.bat | 13 ++++++-------
assemblies/static/src/main/resources/hop-run.bat | 13 ++++++-------
assemblies/static/src/main/resources/hop-search.bat | 13 ++++++-------
assemblies/static/src/main/resources/hop-server.bat | 13 ++++++-------
assemblies/static/src/main/resources/hop-translator.bat | 13 ++++++-------
7 files changed, 42 insertions(+), 49 deletions(-)
diff --git a/assemblies/static/src/main/resources/hop-conf.bat
b/assemblies/static/src/main/resources/hop-conf.bat
index ba516301b0..f2a44c8a43 100644
--- a/assemblies/static/src/main/resources/hop-conf.bat
+++ b/assemblies/static/src/main/resources/hop-conf.bat
@@ -80,14 +80,13 @@ echo.
echo HOP_OPTIONS=%HOP_OPTIONS%
echo.
rem ===[Collect command line
arguments...]======================================
-set _cmdline=
-:TopArg
-if %1!==! goto EndArg
-set _cmdline=%_cmdline% %1
-shift
-goto TopArg
-:EndArg
+if [%1]==[DEBUG] (
+FOR /f "tokens=1*" %%x IN ("%*") DO set _cmdline=%%y
+GOTO Run
+)
+set _cmdline=%*
+:Run
echo Command to start Hop will be:
echo %_HOP_JAVA% -classpath %CLASSPATH% -Djava.library.path=%LIBSPATH%
%HOP_OPTIONS% org.apache.hop.config.HopConfig %_cmdline%
echo.
diff --git a/assemblies/static/src/main/resources/hop-encrypt.bat
b/assemblies/static/src/main/resources/hop-encrypt.bat
index 11004b23e9..21aa4ca982 100644
--- a/assemblies/static/src/main/resources/hop-encrypt.bat
+++ b/assemblies/static/src/main/resources/hop-encrypt.bat
@@ -79,14 +79,13 @@ echo HOP_OPTIONS=%HOP_OPTIONS%
echo.
echo.
rem ===[Collect command line
arguments...]======================================
-set _cmdline=
-:TopArg
-if %1!==! goto EndArg
-set _cmdline=%_cmdline% %1
-shift
-goto TopArg
-:EndArg
+if [%1]==[DEBUG] (
+FOR /f "tokens=1*" %%x IN ("%*") DO set _cmdline=%%y
+GOTO Run
+)
+set _cmdline=%*
+:Run
echo Command to start Hop will be:
echo %_HOP_JAVA% -classpath %CLASSPATH% -Djava.library.path=%LIBSPATH%
%HOP_OPTIONS% org.apache.hop.core.encryption.Encr %_cmdline%
echo.
diff --git a/assemblies/static/src/main/resources/hop-import.bat
b/assemblies/static/src/main/resources/hop-import.bat
index b533e59c87..f084b913bf 100644
--- a/assemblies/static/src/main/resources/hop-import.bat
+++ b/assemblies/static/src/main/resources/hop-import.bat
@@ -80,14 +80,13 @@ echo.
echo HOP_OPTIONS=%HOP_OPTIONS%
echo.
rem ===[Collect command line
arguments...]======================================
-set _cmdline=
-:TopArg
-if %1!==! goto EndArg
-set _cmdline=%_cmdline% %1
-shift
-goto TopArg
-:EndArg
+if [%1]==[DEBUG] (
+FOR /f "tokens=1*" %%x IN ("%*") DO set _cmdline=%%y
+GOTO Run
+)
+set _cmdline=%*
+:Run
echo Command to start Hop will be:
echo %_HOP_JAVA% -classpath %CLASSPATH% -Djava.library.path=%LIBSPATH%
%HOP_OPTIONS% org.apache.hop.config.HopConfig %_cmdline%
echo.
diff --git a/assemblies/static/src/main/resources/hop-run.bat
b/assemblies/static/src/main/resources/hop-run.bat
index 622c834cf8..8e0f40c797 100755
--- a/assemblies/static/src/main/resources/hop-run.bat
+++ b/assemblies/static/src/main/resources/hop-run.bat
@@ -100,14 +100,13 @@ echo.
echo HOP_OPTIONS=%HOP_OPTIONS%
echo.
rem ===[Collect command line
arguments...]======================================
-set _cmdline=
-:TopArg
-if %1!==! goto EndArg
-set _cmdline=%_cmdline% %1
-shift
-goto TopArg
-:EndArg
+if [%1]==[DEBUG] (
+FOR /f "tokens=1*" %%x IN ("%*") DO set _cmdline=%%y
+GOTO Run
+)
+set _cmdline=%*
+:Run
echo.
echo Consolidated parameters to pass to HopRun are
echo %_cmdline%%
diff --git a/assemblies/static/src/main/resources/hop-search.bat
b/assemblies/static/src/main/resources/hop-search.bat
index 52a866fdda..d1dba4130c 100644
--- a/assemblies/static/src/main/resources/hop-search.bat
+++ b/assemblies/static/src/main/resources/hop-search.bat
@@ -80,14 +80,13 @@ echo.
echo HOP_OPTIONS=%HOP_OPTIONS%
echo.
rem ===[Collect command line
arguments...]======================================
-set _cmdline=
-:TopArg
-if %1!==! goto EndArg
-set _cmdline=%_cmdline% %1
-shift
-goto TopArg
-:EndArg
+if [%1]==[DEBUG] (
+FOR /f "tokens=1*" %%x IN ("%*") DO set _cmdline=%%y
+GOTO Run
+)
+set _cmdline=%*
+:Run
echo Command to start Hop will be:
echo %_HOP_JAVA% -classpath %CLASSPATH% -Djava.library.path=%LIBSPATH%
%HOP_OPTIONS% org.apache.hop.config.HopConfig %_cmdline%
echo.
diff --git a/assemblies/static/src/main/resources/hop-server.bat
b/assemblies/static/src/main/resources/hop-server.bat
index 70ea57bda9..82d954f3a8 100644
--- a/assemblies/static/src/main/resources/hop-server.bat
+++ b/assemblies/static/src/main/resources/hop-server.bat
@@ -84,14 +84,13 @@ echo HOP_OPTIONS=%HOP_OPTIONS%
echo.
echo.
rem ===[Collect command line
arguments...]======================================
-set _cmdline=
-:TopArg
-if %1!==! goto EndArg
-set _cmdline=%_cmdline% %1
-shift
-goto TopArg
-:EndArg
+if [%1]==[DEBUG] (
+FOR /f "tokens=1*" %%x IN ("%*") DO set _cmdline=%%y
+GOTO Run
+)
+set _cmdline=%*
+:Run
echo Command to start Hop will be:
echo %_HOP_JAVA% -classpath %CLASSPATH% -Djava.library.path=%LIBSPATH%
%HOP_OPTIONS% org.apache.hop.www.HopServer %_cmdline%
echo.
diff --git a/assemblies/static/src/main/resources/hop-translator.bat
b/assemblies/static/src/main/resources/hop-translator.bat
index 897d55d7f4..39b1b7746f 100644
--- a/assemblies/static/src/main/resources/hop-translator.bat
+++ b/assemblies/static/src/main/resources/hop-translator.bat
@@ -81,14 +81,13 @@ echo HOP_OPTIONS=%HOP_OPTIONS%
echo.
echo.
rem ===[Collect command line
arguments...]======================================
-set _cmdline=
-:TopArg
-if %1!==! goto EndArg
-set _cmdline=%_cmdline% %1
-shift
-goto TopArg
-:EndArg
+if [%1]==[DEBUG] (
+FOR /f "tokens=1*" %%x IN ("%*") DO set _cmdline=%%y
+GOTO Run
+)
+set _cmdline=%*
+:Run
echo Command to start Hop will be:
echo %_HOP_JAVA% -classpath %CLASSPATH% -Djava.library.path=%LIBSPATH%
%HOP_OPTIONS% org.apache.hop.ui.i18n.editor.Translator %_cmdline%
echo.
