updated scripts (linux) + added OIFitsProcessor (oitools CLI)

bourgesl · bourgesl · commit 335f531a8eed · 2022-08-31T10:51:41.000+02:00
diff --git a/jmmc-tools/bin/run.sh b/jmmc-tools/bin/run.sh
@@ -1,9 +1,18 @@
 #!/bin/bash
-# jdk17+: add --illegal-access=permit
+#
+# Simple Java runner for JMMC tools
+#
+
+# jdk17+: add "--illegal-access=permit"
 JAVA_OPTS="-Xms512m -Xmx4g $JAVA_OPTS"
-echo "JAVA_OPTS: $JAVA_OPTS"
+
+echo "Java version:"
+java -version
+
+echo "JAVA_OPTS:   '$JAVA_OPTS'"
+echo "JAVA_TUNING: '$JAVA_TUNING'"
 
 DIR="."
 
-java $JAVA_OPTS -cp $DIR/jmmc-tools-TRUNK-jar-with-dependencies.jar $1 $2 $3
+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
@@ -1,4 +1,7 @@
 #!/bin/bash
+#
+# 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
@@ -1,4 +1,7 @@
 #!/bin/bash
+#
+# 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
@@ -1,4 +1,7 @@
 #!/bin/bash
+#
+# 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
@@ -1,4 +1,7 @@
 #!/bin/bash
+#
+# 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
@@ -0,0 +1,7 @@
+#!/bin/bash
+#
+# CLI 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
@@ -1,6 +1,10 @@
 #!/bin/bash
+#
+# GUI OImaging
+#
 
+# 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
@@ -1,4 +1,7 @@
 #!/bin/bash
+#
+# 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
@@ -1,9 +1,18 @@
 #!/bin/bash
-# jdk17+: add --illegal-access=permit
+#
+# Simple Java runner for JMMC tools
+#
+
+# jdk17+: add "--illegal-access=permit"
 JAVA_OPTS="-Xms512m -Xmx4g $JAVA_OPTS"
-echo "JAVA_OPTS: $JAVA_OPTS"
 
-DIR="target"
+echo "Java version:"
+java -version
+
+echo "JAVA_OPTS:   '$JAVA_OPTS'"
+echo "JAVA_TUNING: '$JAVA_TUNING'"
+
+DIR="bin"
 
-java $JAVA_OPTS -cp $DIR/jmmc-tools-TRUNK-jar-with-dependencies.jar $1 $2 $3
+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
@@ -1,4 +1,7 @@
 #!/bin/bash
+#
+# 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
@@ -1,4 +1,7 @@
 #!/bin/bash
+#
+# 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
@@ -1,4 +1,7 @@
 #!/bin/bash
+#
+# 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
@@ -1,4 +1,7 @@
 #!/bin/bash
+#
+# 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
@@ -0,0 +1,7 @@
+#!/bin/bash
+#
+# CLI OIFitsProcessor
+#
+
+bash run.sh fr.jmmc.oitools.OIFitsProcessor $*;
+
diff --git a/jmmc-tools/run_OImaging-gui.sh b/jmmc-tools/run_OImaging-gui.sh
@@ -1,6 +1,10 @@
 #!/bin/bash
+#
+# GUI OImaging
+#
 
-export JAVA_OPTS="-DRemoteExecutionMode.local=true"
+# 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
@@ -1,4 +1,7 @@
 #!/bin/bash
+#
+# 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
@@ -1,5 +1,14 @@
 #!/bin/bash
+#
+# GUI AppLauncher
+#
+
+echo "Java version:"
+java -version
+
+echo "JAVA_OPTS:   '$JAVA_OPTS'"
+echo "JAVA_TUNING: '$JAVA_TUNING'"
 
 SCRIPTBASE="$(dirname $0)"
-java -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
@@ -1,5 +1,14 @@
 #!/bin/bash
+#
+# GUI Aspro2
+#
+
+echo "Java version:"
+java -version
+
+echo "JAVA_OPTS:   '$JAVA_OPTS'"
+echo "JAVA_TUNING: '$JAVA_TUNING'"
 
 SCRIPTBASE="$(dirname $0)"
-java -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
@@ -1,5 +1,14 @@
 #!/bin/bash
+#
+# GUI LITpro
+#
+
+echo "Java version:"
+java -version
+
+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
@@ -1,5 +1,14 @@
 #!/bin/bash
+#
+# GUI OIFitsExplorer
+#
+
+echo "Java version:"
+java -version
+
+echo "JAVA_OPTS:   '$JAVA_OPTS'"
+echo "JAVA_TUNING: '$JAVA_TUNING'"
 
 SCRIPTBASE="$(dirname $0)"
-java -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
@@ -0,0 +1,14 @@
+#!/bin/bash
+#
+# CLI OIFitsProcessor
+#
+
+echo "Java version:"
+java -version
+
+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 $*;
+
diff --git a/run_OImaging-gui.sh b/run_OImaging-gui.sh
@@ -1,7 +1,17 @@
 #!/bin/bash
+#
+# GUI OImaging
+#
 
-export JAVA_OPTS="-DRemoteExecutionMode.local=false"
+# enable/disable using local docker image:
+JAVA_OPTS="-DRemoteExecutionMode.local=false $JAVA_OPTS"
+
+echo "Java version:"
+java -version
+
+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_OImaging-srv.sh b/run_OImaging-srv.sh
@@ -1,4 +1,7 @@
 #!/bin/bash
+#
+# Local Server OImaging (docker)
+#
 
 # Run docker image:
 cd oimaging-uws-server/runtime/docker/oiservices
diff --git a/run_SearchCal-gui.sh b/run_SearchCal-gui.sh
@@ -1,5 +1,14 @@
 #!/bin/bash
+#
+# GUI SearchCal
+#
+
+echo "Java version:"
+java -version
+
+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" $*;
 
