From 52a9386cf722b1933aa0918dea1bdec43b29dd02 Mon Sep 17 00:00:00 2001 From: mmcwilliams Date: Thu, 4 Jun 2020 09:46:13 -0400 Subject: [PATCH] If no admesh, just print N/A --- scripts/benchmark.sh | 11 ++++++++--- scripts/v1.sh | 11 ++++++++--- scripts/v2.sh | 11 ++++++++--- scripts/v3.sh | 11 ++++++++--- 4 files changed, 32 insertions(+), 12 deletions(-) diff --git a/scripts/benchmark.sh b/scripts/benchmark.sh index 228f868..a3209cf 100644 --- a/scripts/benchmark.sh +++ b/scripts/benchmark.sh @@ -41,9 +41,14 @@ do size=`wc -c < "${TMP}.stl"` size=`echo $size | xargs` - ao=`admesh -c "${TMP}.stl"` - facets=`echo "$ao" | grep "Number of facets" | awk '{print $5}'` - volume=`echo "$ao" | grep "Number of parts" | awk '{print $8}'` + if ! [ -x "$(command -v admesh)" ]; then + facets="N/A" + volume="N/A" + else + ao=`admesh -c "$stl"` + facets=`echo "$ao" | grep "Number of facets" | awk '{print $5}'` + volume=`echo "$ao" | grep "Number of parts" | awk '{print $8}'` + fi line="${VERSION},${CPU},${DATE},${FILENAME},${D},${ROT},100,$size,$facets,$volume,$runtime" echo $line diff --git a/scripts/v1.sh b/scripts/v1.sh index a2dfece..91d92a5 100644 --- a/scripts/v1.sh +++ b/scripts/v1.sh @@ -34,9 +34,14 @@ do hash=`sha256sum "$stl" | awk '{ print $1 }'` fileSize=`wc -c < "$stl"` fileSize=`echo $fileSize | xargs` - ao=`admesh -c "$stl"` - facets=`echo "$ao" | grep "Number of facets" | awk '{print $5}'` - volume=`echo "$ao" | grep "Number of parts" | awk '{print $8}'` + if ! [ -x "$(command -v admesh)" ]; then + facets="N/A" + volume="N/A" + else + ao=`admesh -c "$stl"` + facets=`echo "$ao" | grep "Number of facets" | awk '{print $5}'` + volume=`echo "$ao" | grep "Number of parts" | awk '{print $8}'` + fi line="${VERSION},${CPU},gnal_${SIZE}_${FILE}.stl,$hash,$fileSize,$srchash,$srcsize,$facets,$volume,$runtime" echo "$line" >> $NOTES echo "$line" diff --git a/scripts/v2.sh b/scripts/v2.sh index 4722bc2..2722d1e 100644 --- a/scripts/v2.sh +++ b/scripts/v2.sh @@ -38,9 +38,14 @@ do hash=`sha256sum "$stl" | awk '{ print $1 }'` fileSize=`wc -c < "$stl"` fileSize=`echo $fileSize | xargs` - ao=`admesh -c "$stl"` - facets=`echo "$ao" | grep "Number of facets" | awk '{print $5}'` - volume=`echo "$ao" | grep "Number of parts" | awk '{print $8}'` + if ! [ -x "$(command -v admesh)" ]; then + facets="N/A" + volume="N/A" + else + ao=`admesh -c "$stl"` + facets=`echo "$ao" | grep "Number of facets" | awk '{print $5}'` + volume=`echo "$ao" | grep "Number of parts" | awk '{print $8}'` + fi line="${VERSION},${CPU},$stl,$hash,$fileSize,$srchash,$srcsize,$facets,$volume,$runtime" echo "$line" >> $NOTES echo "$line" diff --git a/scripts/v3.sh b/scripts/v3.sh index 4309daf..556d6ed 100644 --- a/scripts/v3.sh +++ b/scripts/v3.sh @@ -43,9 +43,14 @@ do hash=`sha256sum "$stl" | awk '{ print $1 }'` fileSize=`wc -c < "$stl"` fileSize=`echo $fileSize | xargs` - ao=`admesh -c "$stl"` - facets=`echo "$ao" | grep "Number of facets" | awk '{print $5}'` - volume=`echo "$ao" | grep "Number of parts" | awk '{print $8}'` + if ! [ -x "$(command -v admesh)" ]; then + facets="N/A" + volume="N/A" + else + ao=`admesh -c "$stl"` + facets=`echo "$ao" | grep "Number of facets" | awk '{print $5}'` + volume=`echo "$ao" | grep "Number of parts" | awk '{print $8}'` + fi line="${VERSION},${CPU},$stl,$hash,$fileSize,$srchash,$srcsize,$facets,$volume,$runtime" echo "$line" >> $NOTES