From c038be113a861850ba66640d5fa828c6c96e48b5 Mon Sep 17 00:00:00 2001
From: Robert Izzard <r.izzard@surrey.ac.uk>
Date: Mon, 25 Nov 2019 14:12:57 +0800
Subject: [PATCH] update meson build with more clean up

clean more scripts with shellcheck
---
 clean_release.sh    |  2 +-
 data_object_list.sh | 10 +++++-----
 meson.build         |  4 ++++
 test_solvers.sh     | 28 ++++++++++++++--------------
 4 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/clean_release.sh b/clean_release.sh
index f860a6550..1f770fe47 100644
--- a/clean_release.sh
+++ b/clean_release.sh
@@ -18,7 +18,7 @@ svn rm grid-wrap.pl
 rm amanda_sn_plot.pl binary_c-antiTZ  binary_c-Ba binary_c.orig binary_c-sn2014 binary_c-sn2014.old timing_results TODO tz.objects tbse.TZmerger tbse.TZcomenv test_new_derivs.pl run_tz.pl LOG lithium_tests.pl grid-wrap.pl imfticks do_newfails.pl tbse.COCO tbse.ONeWD test_holly.pl test_holly.plt todo-comenv notes discs.plt C.pl C2.pl disc.plt diffstacks.pl test_restrict.sh valC2.sh 
 
 rm -rf faillist fails imfticks fionread
-rm *~ src/*~ src/*/*~
+rm ./*~ src/*~ src/*/*~
 clean-svn.pl
 
 svn rm novae*pdf
diff --git a/data_object_list.sh b/data_object_list.sh
index 26ff9ccff..d2e13544b 100755
--- a/data_object_list.sh
+++ b/data_object_list.sh
@@ -4,11 +4,11 @@
 # required for the current build of binary_c
 
 # default to gcc
-: ${CC:="gcc"};
-: ${INCDIRS:="-I."}
+: "${CC:=gcc};"
+: "${INCDIRS:=-I.}"
 
 tmpfile=$(mktemp)
-if [ -z $tmpfile ]; then
+if [ -z "$tmpfile" ]; then
     echo "Could not make tmpfile in data_object_list.sh"
     exit
 fi
@@ -17,7 +17,7 @@ fi
 trap 'rm -f -- "$tmpfile"' INT TERM HUP EXIT
 
 # make defined macro list in tmpfile
-$CC $INCDIRS -dM -E main.c > $tmpfile
+"$CC" "$INCDIRS" -dM -E main.c > "$tmpfile"
 
 # function to determine dependency
 function dependency {
@@ -47,5 +47,5 @@ dependency "OBJECT_COMMON_ENVELOPE_COMMON_ENVELOPE_POLYTROPE_3D" "common_envelop
 dependency "OBJECT_OPACITY_FERGUSON_OPAL_16062017" "opacity/ferguson_opal_16062017.o"
 dependency "OBJECT_OPACITY_STARS" "opacity/STARS_Z0.02.dat.o"
 
-echo $OBJECT_LIST
+echo "$OBJECT_LIST"
 export OBJECT_LIST
diff --git a/meson.build b/meson.build
index a244ac1e7..352ae0ccf 100644
--- a/meson.build
+++ b/meson.build
@@ -303,6 +303,7 @@ if os == 'linux'
         '-DLARGEFILE_SOURCE'
     ]
     unix = true
+    posix = true
 elif os == 'darwin'
     # darwin (MacOSX)
     cflags += [
@@ -310,17 +311,20 @@ elif os == 'darwin'
         '-DPOSIX',
     ]
     unix = true
+    posix = true
 elif os == 'windows'
     # windows
     cflags += [
         '-DWINDOWS',
     ]
     unix = false
+    posix = false
 else
     cflags += [
         '-DUNKNOWN_OPERATING_SYSTEM'
     ]
     unix = false
+    posix = false
 endif
 
 ############################################################
diff --git a/test_solvers.sh b/test_solvers.sh
index c604dcd54..14ceaa582 100755
--- a/test_solvers.sh
+++ b/test_solvers.sh
@@ -13,7 +13,7 @@ SYSTEM="M_1 1 M_2 1 separation 4 eccentricity 0.5"
 
 ############################################################
 
-PRE="time tbse orbital_period 0 $SYSTEM max_evolution_time 10 repeat 1 $@"
+PRE="time tbse orbital_period 0 $SYSTEM max_evolution_time 10 repeat 1 $*"
 OUT="/tmp"
 OUT="$HOME/tex/notes/solvers"
 OUT="$HOME/tex/notes/solvers/various"
@@ -25,31 +25,31 @@ OUT="$HOME/tex/notes/solvers/anal"
 
 
 # make outdir
-mkdir -p $OUT
+mkdir -p "$OUT"
 
 echo "Forward Euler"
 CMD="$PRE --log_filename $OUT/c_log.euler --solver 0"
-echo $CMD
+echo "$CMD"
 
-#$CMD maximum_timestep 1000 | filter JJJ > $OUT/jjj.1000.euler
-#$CMD maximum_timestep 1 | filter JJJ > $OUT/jjj.1.euler
-#$CMD maximum_timestep 0.1 | filter JJJ > $OUT/jjj.0.1.euler
-#$CMD maximum_timestep 0.01 | filter JJJ > $OUT/jjj.0.01.euler
-$CMD | filter JJJ > $OUT/jjj.euler
+#"$CMD" maximum_timestep 1000 | filter JJJ > "$OUT"/jjj.1000.euler
+#"$CMD" maximum_timestep 1 | filter JJJ > "$OUT"/jjj.1.euler
+#"$CMD" maximum_timestep 0.1 | filter JJJ > "$OUT"/jjj.0.1.euler
+#"$CMD" maximum_timestep 0.01 | filter JJJ > "$OUT"/jjj.0.01.euler
+"$CMD" | filter JJJ > "$OUT"/jjj.euler
 
 echo "RK2"
 CMD="$PRE --log_filename $OUT/c_log.RK2 --solver 1" 
-echo $CMD
-$CMD | filter JJJ > $OUT/jjj.RK2
+echo "$CMD"
+"$CMD" | filter JJJ > "$OUT"/jjj.RK2
 
 echo "RK4"
 CMD="$PRE --log_filename $OUT/c_log.RK4 --solver 2" 
-echo $CMD
-$CMD | filter JJJ > $OUT/jjj.RK4
+echo "$CMD"
+"$CMD" | filter JJJ > "$OUT"/jjj.RK4
 
 echo "PEC"
 CMD="$PRE --log_filename $OUT/c_log.PEC --solver 3" 
-echo $CMD
-$CMD | filter JJJ > $OUT/jjj.PEC
+echo "$CMD"
+"$CMD" | filter JJJ > "$OUT"/jjj.PEC
 
 # at 1Gyr: Euler = 2.75, RK2 = 2.9 : RK2 is more correct
-- 
GitLab