Added automatic detection of platform-specific open command

lf-lang · Jan 24, 2023 · dd8495a · dd8495a · lhstrh · Jan 24, 2023
1 parent 348ad89
commit dd8495a
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 12 deletions.
diff --git a/C/src/modal_models/FurutaPendulum/FurutaPendulum.lf b/C/src/modal_models/FurutaPendulum/FurutaPendulum.lf
@@ -10,10 +10,7 @@
  * This program specifies a build script that only code generates
  * and compiles the program, as usual, but also executes the
  * program and processes its output to generate and open a
- * plot. You may need to change the last argument passed to 
- * the build script to the name of a PDF viewer installed on
- * your system.
- * 
+ * plot. 
  * You have to have installed gnuplot and have it in your
  * PATH for this script to work as expected (and also cmake).
  * 
@@ -23,7 +20,7 @@ target C {
     timeout: 3 secs,
     fast: true,
     flags: "-lm",
-    build: "./build_run_plot.sh FurutaPendulum open"
+    build: "./build_run_plot.sh FurutaPendulum"
 }
 import PendulumController from "PendulumController.lf";
 import PendulumSimulation from "PendulumSimulation.lf";
@@ -43,4 +40,4 @@ main reactor {
     c.energy -> p.energy;
     s.theta -> p.theta;
     s.phi -> p.phi;
-}
+}
diff --git a/C/src/modal_models/FurutaPendulum/FurutaPendulumDisturbance.lf b/C/src/modal_models/FurutaPendulum/FurutaPendulumDisturbance.lf
@@ -8,7 +8,7 @@ target C {
     timeout: 5 secs,
     fast: true,
     flags: "-lm",
-    build: "./build_run_plot.sh FurutaPendulumDisturbance open"
+    build: "./build_run_plot.sh FurutaPendulumDisturbance"
 }
 import PendulumController from "PendulumController.lf";
 import PendulumSimulation from "PendulumSimulation.lf";

diff --git a/C/src/modal_models/FurutaPendulum/README.md b/C/src/modal_models/FurutaPendulum/README.md
@@ -18,8 +18,8 @@ It relies on [cmake](https://cmake.org/) and [gnuplot](http://www.gnuplot.info/)
 The script is not compatible to Windows systems.
 
 The script automatically opens the resulting plot.
-By default it uses the 'open' command (MacOS).
-You may need to change the last argument passed to the build script to the name of a PDF viewer installed on your system (e.g. 'xdg-open' on Linux).
+By default it uses the 'open' command on MacOS and 'xdg-open' on Linux.
+If this command is not available on your system you have to adjust the script ('openPDF' variable).
 
 
 ## Summary of the Examples

diff --git a/C/src/modal_models/FurutaPendulum/build_run_plot.sh b/C/src/modal_models/FurutaPendulum/build_run_plot.sh
@@ -4,6 +4,12 @@
 # The first argument is the name of the main reactor
 # and the second argument is the viewer to render the PDF in.
 
+# Determine platform specific command to open PDF
+openPDF="open"
+if [[ "$OSTYPE" =~ ^linux ]]; then
+    openPDF="xdg-open"
+fi
+
 # Build the generated code.
 cd ${LF_SOURCE_GEN_DIRECTORY}
 cmake .
@@ -22,10 +28,10 @@ ${LF_BIN_DIRECTORY}/$1
 gnuplot pendulum.gnuplot
 
 # Open the produced PDF using the specified viewer
-if ! command -v $2 &> /dev/null
+if ! command -v $openPDF &> /dev/null
 then
-    echo "'$2' could not be found; please specify another PDF viewer."
+    echo "'$openPDF' could not be found; please specify another PDF viewer."
     exit
 else
-    $2 pendulum.pdf &
+    $openPDF pendulum.pdf &
 fi