handle positional arguments (without word splitting)

gmella · gmella · commit 25f4c146e5eb · 2024-09-20T12:42:42.000+02:00
diff --git a/jmmc-tools/bin/run_AppLauncher-gui.bat b/jmmc-tools/bin/run_AppLauncher-gui.bat
@@ -8,5 +8,5 @@ REM
 # set main class:
 CLASS=fr.jmmc.smprun.AppLauncher
 
-CALL run_jmmc.bat
+CALL run_jmmc.bat %*
 
diff --git a/jmmc-tools/bin/run_AppLauncher-gui.sh b/jmmc-tools/bin/run_AppLauncher-gui.sh
@@ -9,7 +9,7 @@
 # set main class:
 export CLASS=fr.jmmc.smprun.AppLauncher
 
-bash run_jmmc.sh
+bash run_jmmc.sh "${@}"
 
 # --- EoF ---
 
diff --git a/jmmc-tools/bin/run_Aspro2-gui.bat b/jmmc-tools/bin/run_Aspro2-gui.bat
@@ -11,5 +11,5 @@ REM SET JAVA_OPTS=-Djmal.bb=false
 REM set main class:
 SET CLASS=fr.jmmc.aspro.Aspro2
 
-CALL run_jmmc.bat
+CALL run_jmmc.bat %*
 
diff --git a/jmmc-tools/bin/run_Aspro2-gui.sh b/jmmc-tools/bin/run_Aspro2-gui.sh
@@ -11,7 +11,7 @@
 # set main class:
 export CLASS=fr.jmmc.aspro.Aspro2
 
-bash run_jmmc.sh
+bash run_jmmc.sh "${@}"
 
 # --- EoF ---
 
diff --git a/jmmc-tools/bin/run_LITpro-gui.bat b/jmmc-tools/bin/run_LITpro-gui.bat
@@ -8,5 +8,5 @@ REM
 REM set main class:
 SET CLASS=fr.jmmc.mf.LITpro
 
-CALL run_jmmc.bat
+CALL run_jmmc.bat %*
 
diff --git a/jmmc-tools/bin/run_LITpro-gui.sh b/jmmc-tools/bin/run_LITpro-gui.sh
@@ -8,7 +8,7 @@
 # set main class:
 export CLASS=fr.jmmc.mf.LITpro
 
-bash run_jmmc.sh
+bash run_jmmc.sh "${@}"
 
 # --- EoF ---
 
diff --git a/jmmc-tools/bin/run_OIFitsExplorer-gui.bat b/jmmc-tools/bin/run_OIFitsExplorer-gui.bat
@@ -8,5 +8,5 @@ REM
 REM set main class:
 SET CLASS=fr.jmmc.oiexplorer.OIFitsExplorer
 
-CALL run_jmmc.bat
+CALL run_jmmc.bat %*
 
diff --git a/jmmc-tools/bin/run_OIFitsExplorer-gui.sh b/jmmc-tools/bin/run_OIFitsExplorer-gui.sh
@@ -8,7 +8,7 @@
 # set main class:
 export CLASS=fr.jmmc.oiexplorer.OIFitsExplorer
 
-bash run_jmmc.sh
+bash run_jmmc.sh "${@}"
 
 # --- EoF ---
 
diff --git a/jmmc-tools/bin/run_OIFitsProcessor.bat b/jmmc-tools/bin/run_OIFitsProcessor.bat
@@ -11,4 +11,4 @@ REM SET JAVA_OPTS=-Djmal.bb=false
 REM set main class:
 SET CLASS=fr.jmmc.oitools.OIFitsProcessor
 
-CALL run_jmmc.bat
+CALL run_jmmc.bat %*
diff --git a/jmmc-tools/bin/run_OIFitsProcessor.sh b/jmmc-tools/bin/run_OIFitsProcessor.sh
@@ -8,7 +8,7 @@
 # set main class:
 export CLASS=fr.jmmc.oitools.OIFitsProcessor
 
-bash run_jmmc.sh
+bash run_jmmc.sh "${@}"
 
 # --- EoF ---
 
diff --git a/jmmc-tools/bin/run_OImaging-gui.bat b/jmmc-tools/bin/run_OImaging-gui.bat
@@ -11,5 +11,5 @@ REM SET JAVA_OPTS="-DRemoteExecutionMode.local=false"
 REM set main class:
 SET CLASS=fr.jmmc.oimaging.OImaging
 
-CALL run_jmmc.bat
+CALL run_jmmc.bat %*
 
diff --git a/jmmc-tools/bin/run_OImaging-gui.sh b/jmmc-tools/bin/run_OImaging-gui.sh
@@ -9,7 +9,7 @@
 # set main class:
 export CLASS=fr.jmmc.oimaging.OImaging
 
-bash run_jmmc.sh
+bash run_jmmc.sh "${@}"
 
 # --- EoF ---
 
diff --git a/jmmc-tools/bin/run_SearchCal-gui.bat b/jmmc-tools/bin/run_SearchCal-gui.bat
@@ -8,5 +8,5 @@ REM
 REM set main class:
 SET CLASS=fr.jmmc.sclgui.SearchCal
 
-CALL run_jmmc.bat
+CALL run_jmmc.bat %*
 
diff --git a/jmmc-tools/bin/run_SearchCal-gui.sh b/jmmc-tools/bin/run_SearchCal-gui.sh
@@ -8,7 +8,7 @@
 # set main class:
 export CLASS=fr.jmmc.sclgui.SearchCal
 
-bash run_jmmc.sh
+bash run_jmmc.sh "${@}"
 
 # --- EoF ---
 
diff --git a/jmmc-tools/bin/run_jmmc.bat b/jmmc-tools/bin/run_jmmc.bat
@@ -10,12 +10,13 @@ CALL env.bat
 echo "JAVA_OPTS:   '%JAVA_OPTS%'"
 echo "JAVA_TUNING: '%JAVA_TUNING%'"
 
-SET CMD=java %JAVA_TUNING% %JAVA_OPTS% -cp %DIR%\jmmc-tools-TRUNK-jar-with-dependencies.jar %CLASS% %*
+SET CMD=java %JAVA_TUNING% %JAVA_OPTS% -cp %DIR%\jmmc-tools-TRUNK-jar-with-dependencies.jar %CLASS%
 
 echo "CMD: %CMD%"
+echo "ARGS: %*"
 
 echo "------------------------------------------------------------------------------"
-%CMD%
+%CMD% %*
 echo "------------------------------------------------------------------------------"
 
 REM --- EoF ---
diff --git a/jmmc-tools/bin/run_jmmc.sh b/jmmc-tools/bin/run_jmmc.sh
@@ -10,12 +10,13 @@ source ./env.sh
 echo "JAVA_OPTS:   '${JAVA_OPTS}'"
 echo "JAVA_TUNING: '${JAVA_TUNING}'"
 
-CMD="java ${JAVA_TUNING} ${JAVA_OPTS} -cp ${DIR}/jmmc-tools-TRUNK-jar-with-dependencies.jar ${CLASS} $@"
+CMD="java ${JAVA_TUNING} ${JAVA_OPTS} -cp ${DIR}/jmmc-tools-TRUNK-jar-with-dependencies.jar ${CLASS}"
 
 # echo "CMD: ${CMD}"
+# echo "ARGS: ${@}"
 
 echo "------------------------------------------------------------------------------"
-$CMD
+$CMD "${@}"
 echo "------------------------------------------------------------------------------"
 
 # --- EoF ---
diff --git a/jmmc-tools/run_AppLauncher-gui.bat b/jmmc-tools/run_AppLauncher-gui.bat
@@ -8,5 +8,5 @@ REM
 # set main class:
 CLASS=fr.jmmc.smprun.AppLauncher
 
-CALL run_jmmc.bat
+CALL run_jmmc.bat %*
 
diff --git a/jmmc-tools/run_AppLauncher-gui.sh b/jmmc-tools/run_AppLauncher-gui.sh
@@ -9,7 +9,7 @@
 # set main class:
 export CLASS=fr.jmmc.smprun.AppLauncher
 
-bash run_jmmc.sh
+bash run_jmmc.sh "${@}"
 
 # --- EoF ---
 
diff --git a/jmmc-tools/run_Aspro2-gui.bat b/jmmc-tools/run_Aspro2-gui.bat
@@ -11,5 +11,5 @@ REM SET JAVA_OPTS=-Djmal.bb=false
 REM set main class:
 SET CLASS=fr.jmmc.aspro.Aspro2
 
-CALL run_jmmc.bat
+CALL run_jmmc.bat %*
 
diff --git a/jmmc-tools/run_Aspro2-gui.sh b/jmmc-tools/run_Aspro2-gui.sh
@@ -11,7 +11,7 @@
 # set main class:
 export CLASS=fr.jmmc.aspro.Aspro2
 
-bash run_jmmc.sh
+bash run_jmmc.sh "${@}"
 
 # --- EoF ---
 
diff --git a/jmmc-tools/run_LITpro-gui.bat b/jmmc-tools/run_LITpro-gui.bat
@@ -8,5 +8,5 @@ REM
 REM set main class:
 SET CLASS=fr.jmmc.mf.LITpro
 
-CALL run_jmmc.bat
+CALL run_jmmc.bat %*
 
diff --git a/jmmc-tools/run_LITpro-gui.sh b/jmmc-tools/run_LITpro-gui.sh
@@ -8,7 +8,7 @@
 # set main class:
 export CLASS=fr.jmmc.mf.LITpro
 
-bash run_jmmc.sh
+bash run_jmmc.sh "${@}"
 
 # --- EoF ---
 
diff --git a/jmmc-tools/run_OIFitsExplorer-gui.bat b/jmmc-tools/run_OIFitsExplorer-gui.bat
@@ -8,5 +8,5 @@ REM
 REM set main class:
 SET CLASS=fr.jmmc.oiexplorer.OIFitsExplorer
 
-CALL run_jmmc.bat
+CALL run_jmmc.bat %*
 
diff --git a/jmmc-tools/run_OIFitsExplorer-gui.sh b/jmmc-tools/run_OIFitsExplorer-gui.sh
@@ -8,7 +8,7 @@
 # set main class:
 export CLASS=fr.jmmc.oiexplorer.OIFitsExplorer
 
-bash run_jmmc.sh
+bash run_jmmc.sh "${@}"
 
 # --- EoF ---
 
diff --git a/jmmc-tools/run_OIFitsProcessor.bat b/jmmc-tools/run_OIFitsProcessor.bat
@@ -11,4 +11,4 @@ REM SET JAVA_OPTS=-Djmal.bb=false
 REM set main class:
 SET CLASS=fr.jmmc.oitools.OIFitsProcessor
 
-CALL run_jmmc.bat
+CALL run_jmmc.bat %*
diff --git a/jmmc-tools/run_OIFitsProcessor.sh b/jmmc-tools/run_OIFitsProcessor.sh
@@ -8,7 +8,7 @@
 # set main class:
 export CLASS=fr.jmmc.oitools.OIFitsProcessor
 
-bash run_jmmc.sh
+bash run_jmmc.sh "${@}"
 
 # --- EoF ---
 
diff --git a/jmmc-tools/run_OImaging-gui.bat b/jmmc-tools/run_OImaging-gui.bat
@@ -11,5 +11,5 @@ REM SET JAVA_OPTS="-DRemoteExecutionMode.local=false"
 REM set main class:
 SET CLASS=fr.jmmc.oimaging.OImaging
 
-CALL run_jmmc.bat
+CALL run_jmmc.bat %*
 
diff --git a/jmmc-tools/run_OImaging-gui.sh b/jmmc-tools/run_OImaging-gui.sh
@@ -9,7 +9,7 @@
 # set main class:
 export CLASS=fr.jmmc.oimaging.OImaging
 
-bash run_jmmc.sh
+bash run_jmmc.sh "${@}"
 
 # --- EoF ---
 
diff --git a/jmmc-tools/run_SearchCal-gui.bat b/jmmc-tools/run_SearchCal-gui.bat
@@ -8,5 +8,5 @@ REM
 REM set main class:
 SET CLASS=fr.jmmc.sclgui.SearchCal
 
-CALL run_jmmc.bat
+CALL run_jmmc.bat %*
 
diff --git a/jmmc-tools/run_SearchCal-gui.sh b/jmmc-tools/run_SearchCal-gui.sh
@@ -8,7 +8,7 @@
 # set main class:
 export CLASS=fr.jmmc.sclgui.SearchCal
 
-bash run_jmmc.sh
+bash run_jmmc.sh "${@}"
 
 # --- EoF ---
 
diff --git a/jmmc-tools/run_jmmc.bat b/jmmc-tools/run_jmmc.bat
@@ -10,12 +10,13 @@ CALL env.bat
 echo "JAVA_OPTS:   '%JAVA_OPTS%'"
 echo "JAVA_TUNING: '%JAVA_TUNING%'"
 
-SET CMD=java %JAVA_TUNING% %JAVA_OPTS% -cp %DIR%\jmmc-tools-TRUNK-jar-with-dependencies.jar %CLASS% %*
+SET CMD=java %JAVA_TUNING% %JAVA_OPTS% -cp %DIR%\jmmc-tools-TRUNK-jar-with-dependencies.jar %CLASS%
 
 echo "CMD: %CMD%"
+echo "ARGS: %*"
 
 echo "------------------------------------------------------------------------------"
-%CMD%
+%CMD% %*
 echo "------------------------------------------------------------------------------"
 
 REM --- EoF ---
diff --git a/jmmc-tools/run_jmmc.sh b/jmmc-tools/run_jmmc.sh
@@ -10,12 +10,13 @@ source ./env.sh
 echo "JAVA_OPTS:   '${JAVA_OPTS}'"
 echo "JAVA_TUNING: '${JAVA_TUNING}'"
 
-CMD="java ${JAVA_TUNING} ${JAVA_OPTS} -cp ${DIR}/jmmc-tools-TRUNK-jar-with-dependencies.jar ${CLASS} $@"
+CMD="java ${JAVA_TUNING} ${JAVA_OPTS} -cp ${DIR}/jmmc-tools-TRUNK-jar-with-dependencies.jar ${CLASS}"
 
 # echo "CMD: ${CMD}"
+# echo "ARGS: ${@}"
 
 echo "------------------------------------------------------------------------------"
-$CMD
+$CMD "${@}"
 echo "------------------------------------------------------------------------------"
 
 # --- EoF ---
