merge shell scripts

bourgesl · bourgesl · commit 3a8dc9e4dea8 · 2022-08-31T11:03:06.000+02:00
diff --git a/README.md b/README.md
@@ -39,6 +39,8 @@ Instructions:
       `./run_SearchCal-gui.sh`
   - run OIFitsExplorer GUI:
       `./run_OIFitsExplorer-gui.sh`
+  - run OIFitsProcessor CLI:
+      `./run_OIFitsProcessor.sh`
   - run LITpro GUI:
       `./run_LITpro-gui.sh`
   - run OImaging:
diff --git a/jmmc-tools/bin/run.sh b/jmmc-tools/bin/run.sh
@@ -14,5 +14,5 @@ echo "JAVA_TUNING: '$JAVA_TUNING'"
 
 DIR="."
 
-java $JAVA_TUNING $JAVA_OPTS -cp "$DIR/jmmc-tools-TRUNK-jar-with-dependencies.jar" $*;
+java $JAVA_TUNING $JAVA_OPTS -cp "$DIR/jmmc-tools-TRUNK-jar-with-dependencies.jar" "$@"
 
diff --git a/jmmc-tools/bin/run_AppLauncher-gui.sh b/jmmc-tools/bin/run_AppLauncher-gui.sh
@@ -3,5 +3,5 @@
 # GUI AppLauncher
 #
 
-bash run.sh fr.jmmc.smprun.AppLauncher $*;
+bash run.sh fr.jmmc.smprun.AppLauncher "$@"
 
diff --git a/jmmc-tools/bin/run_Aspro2-gui.sh b/jmmc-tools/bin/run_Aspro2-gui.sh
@@ -3,5 +3,5 @@
 # GUI Aspro2
 #
 
-bash run.sh fr.jmmc.aspro.Aspro2 $*;
+bash run.sh fr.jmmc.aspro.Aspro2 "$@"
 
diff --git a/jmmc-tools/bin/run_LITpro-gui.sh b/jmmc-tools/bin/run_LITpro-gui.sh
@@ -3,5 +3,5 @@
 # GUI LITpro
 #
 
-bash run.sh fr.jmmc.mf.LITpro $*;
+bash run.sh fr.jmmc.mf.LITpro "$@"
 
diff --git a/jmmc-tools/bin/run_OIFitsExplorer-gui.sh b/jmmc-tools/bin/run_OIFitsExplorer-gui.sh
@@ -3,5 +3,5 @@
 # GUI OIFitsExplorer
 #
 
-bash run.sh fr.jmmc.oiexplorer.OIFitsExplorer $*;
+bash run.sh fr.jmmc.oiexplorer.OIFitsExplorer "$@"
 
diff --git a/jmmc-tools/bin/run_OIFitsProcessor.sh b/jmmc-tools/bin/run_OIFitsProcessor.sh
@@ -3,5 +3,5 @@
 # CLI OIFitsProcessor
 #
 
-bash run.sh fr.jmmc.oitools.OIFitsProcessor $*;
+bash run.sh fr.jmmc.oitools.OIFitsProcessor "$@"
 
diff --git a/jmmc-tools/bin/run_OImaging-gui.sh b/jmmc-tools/bin/run_OImaging-gui.sh
@@ -6,5 +6,5 @@
 # enable/disable using local docker image:
 export JAVA_OPTS="-DRemoteExecutionMode.local=false"
 
-bash run.sh fr.jmmc.oimaging.OImaging $*;
+bash run.sh fr.jmmc.oimaging.OImaging "$@"
 
diff --git a/jmmc-tools/bin/run_SearchCal-gui.sh b/jmmc-tools/bin/run_SearchCal-gui.sh
@@ -3,5 +3,5 @@
 # GUI SearchCal
 #
 
-bash run.sh fr.jmmc.sclgui.SearchCal $*;
+bash run.sh fr.jmmc.sclgui.SearchCal "$@"
 
diff --git a/jmmc-tools/run.sh b/jmmc-tools/run.sh
@@ -14,5 +14,5 @@ echo "JAVA_TUNING: '$JAVA_TUNING'"
 
 DIR="bin"
 
-java $JAVA_TUNING $JAVA_OPTS -cp "$DIR/jmmc-tools-TRUNK-jar-with-dependencies.jar" $*;
+java $JAVA_TUNING $JAVA_OPTS -cp "$DIR/jmmc-tools-TRUNK-jar-with-dependencies.jar" "$@"
 
diff --git a/jmmc-tools/run_AppLauncher-gui.sh b/jmmc-tools/run_AppLauncher-gui.sh
@@ -3,5 +3,5 @@
 # GUI AppLauncher
 #
 
-bash run.sh fr.jmmc.smprun.AppLauncher $*;
+bash run.sh fr.jmmc.smprun.AppLauncher "$@"
 
diff --git a/jmmc-tools/run_Aspro2-gui.sh b/jmmc-tools/run_Aspro2-gui.sh
@@ -3,5 +3,5 @@
 # GUI Aspro2
 #
 
-bash run.sh fr.jmmc.aspro.Aspro2 $*;
+bash run.sh fr.jmmc.aspro.Aspro2 "$@"
 
diff --git a/jmmc-tools/run_LITpro-gui.sh b/jmmc-tools/run_LITpro-gui.sh
@@ -3,5 +3,5 @@
 # GUI LITpro
 #
 
-bash run.sh fr.jmmc.mf.LITpro $*;
+bash run.sh fr.jmmc.mf.LITpro "$@"
 
diff --git a/jmmc-tools/run_OIFitsExplorer-gui.sh b/jmmc-tools/run_OIFitsExplorer-gui.sh
@@ -3,5 +3,5 @@
 # GUI OIFitsExplorer
 #
 
-bash run.sh fr.jmmc.oiexplorer.OIFitsExplorer $*;
+bash run.sh fr.jmmc.oiexplorer.OIFitsExplorer "$@"
 
diff --git a/jmmc-tools/run_OIFitsProcessor.sh b/jmmc-tools/run_OIFitsProcessor.sh
@@ -3,5 +3,5 @@
 # CLI OIFitsProcessor
 #
 
-bash run.sh fr.jmmc.oitools.OIFitsProcessor $*;
+bash run.sh fr.jmmc.oitools.OIFitsProcessor "$@"
 
diff --git a/jmmc-tools/run_OImaging-gui.sh b/jmmc-tools/run_OImaging-gui.sh
@@ -6,5 +6,5 @@
 # enable/disable using local docker image:
 export JAVA_OPTS="-DRemoteExecutionMode.local=false"
 
-bash run.sh fr.jmmc.oimaging.OImaging $*;
+bash run.sh fr.jmmc.oimaging.OImaging "$@"
 
diff --git a/jmmc-tools/run_SearchCal-gui.sh b/jmmc-tools/run_SearchCal-gui.sh
@@ -3,5 +3,5 @@
 # GUI SearchCal
 #
 
-bash run.sh fr.jmmc.sclgui.SearchCal $*;
+bash run.sh fr.jmmc.sclgui.SearchCal "$@"
 
diff --git a/run_AppLauncher-gui.sh b/run_AppLauncher-gui.sh
@@ -10,5 +10,5 @@ echo "JAVA_OPTS:   '$JAVA_OPTS'"
 echo "JAVA_TUNING: '$JAVA_TUNING'"
 
 SCRIPTBASE="$(dirname $0)"
-java $JAVA_TUNING $JAVA_OPTS -jar "${SCRIPTBASE}/smprun/target/smprun-TRUNK-jar-with-dependencies.jar" $*;
+java $JAVA_TUNING $JAVA_OPTS -jar "${SCRIPTBASE}/smprun/target/smprun-TRUNK-jar-with-dependencies.jar" "$@"
 
diff --git a/run_Aspro2-gui.sh b/run_Aspro2-gui.sh
@@ -10,5 +10,5 @@ echo "JAVA_OPTS:   '$JAVA_OPTS'"
 echo "JAVA_TUNING: '$JAVA_TUNING'"
 
 SCRIPTBASE="$(dirname $0)"
-java $JAVA_TUNING $JAVA_OPTS -jar "${SCRIPTBASE}/aspro/target/aspro2-TRUNK-jar-with-dependencies.jar" $*;
+java $JAVA_TUNING $JAVA_OPTS -jar "${SCRIPTBASE}/aspro/target/aspro2-TRUNK-jar-with-dependencies.jar" "$@"
 
diff --git a/run_LITpro-gui.sh b/run_LITpro-gui.sh
@@ -10,5 +10,5 @@ echo "JAVA_OPTS:   '$JAVA_OPTS'"
 echo "JAVA_TUNING: '$JAVA_TUNING'"
 
 SCRIPTBASE="$(dirname $0)"
-java -jar "${SCRIPTBASE}/mfgui/target/mfgui-TRUNK-jar-with-dependencies.jar" $*;
+java -jar "${SCRIPTBASE}/mfgui/target/mfgui-TRUNK-jar-with-dependencies.jar" "$@"
 
diff --git a/run_OIFitsExplorer-gui.sh b/run_OIFitsExplorer-gui.sh
@@ -10,5 +10,5 @@ echo "JAVA_OPTS:   '$JAVA_OPTS'"
 echo "JAVA_TUNING: '$JAVA_TUNING'"
 
 SCRIPTBASE="$(dirname $0)"
-java $JAVA_TUNING $JAVA_OPTS -jar "${SCRIPTBASE}/oiexplorer/target/oiexplorer-TRUNK-jar-with-dependencies.jar" $*;
+java $JAVA_TUNING $JAVA_OPTS -jar "${SCRIPTBASE}/oiexplorer/target/oiexplorer-TRUNK-jar-with-dependencies.jar" "$@"
 
diff --git a/run_OIFitsProcessor.sh b/run_OIFitsProcessor.sh
@@ -10,5 +10,5 @@ echo "JAVA_OPTS:   '$JAVA_OPTS'"
 echo "JAVA_TUNING: '$JAVA_TUNING'"
 
 SCRIPTBASE="$(dirname $0)"
-java $JAVA_TUNING $JAVA_OPTS -cp "${SCRIPTBASE}/oiexplorer/target/oiexplorer-TRUNK-jar-with-dependencies.jar" fr.jmmc.oitools.OIFitsProcessor $*;
+java $JAVA_TUNING $JAVA_OPTS -cp "${SCRIPTBASE}/oiexplorer/target/oiexplorer-TRUNK-jar-with-dependencies.jar" fr.jmmc.oitools.OIFitsProcessor "$@"
 
diff --git a/run_OImaging-gui.sh b/run_OImaging-gui.sh
@@ -13,5 +13,5 @@ echo "JAVA_OPTS:   '$JAVA_OPTS'"
 echo "JAVA_TUNING: '$JAVA_TUNING'"
 
 SCRIPTBASE="$(dirname $0)"
-java $JAVA_OPTS -jar "${SCRIPTBASE}/oimaging/target/oimaging-TRUNK-jar-with-dependencies.jar" $*;
+java $JAVA_OPTS -jar "${SCRIPTBASE}/oimaging/target/oimaging-TRUNK-jar-with-dependencies.jar" "$@"
 
diff --git a/run_SearchCal-gui.sh b/run_SearchCal-gui.sh
@@ -10,5 +10,5 @@ echo "JAVA_OPTS:   '$JAVA_OPTS'"
 echo "JAVA_TUNING: '$JAVA_TUNING'"
 
 SCRIPTBASE="$(dirname $0)"
-java -jar "${SCRIPTBASE}/sclgui/target/sclgui-TRUNK-jar-with-dependencies.jar" $*;
+java -jar "${SCRIPTBASE}/sclgui/target/sclgui-TRUNK-jar-with-dependencies.jar" "$@"
 

Original file line number	Diff line number	Diff line change
`@@ -14,5 +14,5 @@ echo "JAVA_TUNING: '$JAVA_TUNING'"`
`14`	`14`
`15`	`15`	`DIR="."`
`16`	`16`
`17`		`-java $JAVA_TUNING $JAVA_OPTS -cp "$DIR/jmmc-tools-TRUNK-jar-with-dependencies.jar" $*;`
	`17`	`+java $JAVA_TUNING $JAVA_OPTS -cp "$DIR/jmmc-tools-TRUNK-jar-with-dependencies.jar" "$@"`
`18`	`18`
Original file line number	Diff line number	Diff line change
`@@ -3,5 +3,5 @@`
`3`	`3`	`# GUI AppLauncher`
`4`	`4`	`#`
`5`	`5`
`6`		`-bash run.sh fr.jmmc.smprun.AppLauncher $*;`
	`6`	`+bash run.sh fr.jmmc.smprun.AppLauncher "$@"`
`7`	`7`
Original file line number	Diff line number	Diff line change
`@@ -3,5 +3,5 @@`
`3`	`3`	`# GUI Aspro2`
`4`	`4`	`#`
`5`	`5`
`6`		`-bash run.sh fr.jmmc.aspro.Aspro2 $*;`
	`6`	`+bash run.sh fr.jmmc.aspro.Aspro2 "$@"`
`7`	`7`
Original file line number	Diff line number	Diff line change
`@@ -3,5 +3,5 @@`
`3`	`3`	`# GUI LITpro`
`4`	`4`	`#`
`5`	`5`
`6`		`-bash run.sh fr.jmmc.mf.LITpro $*;`
	`6`	`+bash run.sh fr.jmmc.mf.LITpro "$@"`
`7`	`7`
Original file line number	Diff line number	Diff line change
`@@ -3,5 +3,5 @@`
`3`	`3`	`# GUI OIFitsExplorer`
`4`	`4`	`#`
`5`	`5`
`6`		`-bash run.sh fr.jmmc.oiexplorer.OIFitsExplorer $*;`
	`6`	`+bash run.sh fr.jmmc.oiexplorer.OIFitsExplorer "$@"`
`7`	`7`
Original file line number	Diff line number	Diff line change
`@@ -3,5 +3,5 @@`
`3`	`3`	`# CLI OIFitsProcessor`
`4`	`4`	`#`
`5`	`5`
`6`		`-bash run.sh fr.jmmc.oitools.OIFitsProcessor $*;`
	`6`	`+bash run.sh fr.jmmc.oitools.OIFitsProcessor "$@"`
`7`	`7`
Original file line number	Diff line number	Diff line change
`@@ -3,5 +3,5 @@`
`3`	`3`	`# GUI SearchCal`
`4`	`4`	`#`
`5`	`5`
`6`		`-bash run.sh fr.jmmc.sclgui.SearchCal $*;`
	`6`	`+bash run.sh fr.jmmc.sclgui.SearchCal "$@"`
`7`	`7`