From ceb7580f8b3e58f81288e1b6ff3a1e0ec6d8e4de Mon Sep 17 00:00:00 2001
From: mmcwilliams <hi@mmcwilliams.com>
Date: Sat, 23 May 2020 14:26:18 -0400
Subject: [PATCH] Set filenames to variables in v1 script

---
 scripts/v1.sh | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/scripts/v1.sh b/scripts/v1.sh
index 923c988..bdc05e5 100644
--- a/scripts/v1.sh
+++ b/scripts/v1.sh
@@ -24,17 +24,19 @@ do
 	for FILE in "${FILES[@]}"
 	do
 	   : 
-	    echo "${SIZE}_v1/${FILE}.scad"
+	    stl="${DIST}/${SIZE}_v1/gnal_${SIZE}_${FILE}.stl"
+	    scad="${SIZE}_v1/${FILE}.scad"
+	    echo "$scad"
 	    start=`date +%s`
-		openscad -o "${DIST}/${SIZE}_v1/gnal_${SIZE}_${FILE}.stl" "${SIZE}_v1/${FILE}.scad"
+		openscad -o "$stl" "$scad"
 		end=`date +%s`
 		runtime=$((end-start))
-		hash=`sha256sum "${DIST}/${SIZE}_v1/gnal_${SIZE}_${FILE}.stl" | awk '{ print $1 }'`
-		fileSize=`wc -c < "${DIST}/${SIZE}_v1/gnal_${SIZE}_${FILE}.stl"`
+		hash=`sha256sum "$stl" | awk '{ print $1 }'`
+		fileSize=`wc -c < "$stl"`
 		fileSize=`echo $fileSize | xargs`
-		ao=`admesh -c "${DIST}/${SIZE}_v1/gnal_${SIZE}_${FILE}.stl"`
-		facets=`echo $ao | grep "Number of facets" | awk '{print $5}'`
-		volume=`echo $ao | grep "Number of parts"  | awk '{print $8}'`
+		ao=`admesh -c "$stl"`
+		facets=`echo "$ao" | grep "Number of facets" | awk '{print $5}'`
+		volume=`echo "$ao" | grep "Number of parts"  | awk '{print $8}'`
 		line="${VERSION},${CPU},gnal_${SIZE}_${FILE}.stl,$hash,$fileSize,$srchash,$srcsize,$facets,$volume,$runtime"
 		echo "$line" >> $NOTES
 		echo "$line"