diff --git a/100ft_v1/gnal_100ft.scad b/scad/100ft_v1/gnal_100ft.scad similarity index 100% rename from 100ft_v1/gnal_100ft.scad rename to scad/100ft_v1/gnal_100ft.scad diff --git a/100ft_v1/spacer.scad b/scad/100ft_v1/spacer.scad similarity index 100% rename from 100ft_v1/spacer.scad rename to scad/100ft_v1/spacer.scad diff --git a/100ft_v1/spiral_bottom.scad b/scad/100ft_v1/spiral_bottom.scad similarity index 100% rename from 100ft_v1/spiral_bottom.scad rename to scad/100ft_v1/spiral_bottom.scad diff --git a/100ft_v1/spiral_top.scad b/scad/100ft_v1/spiral_top.scad similarity index 100% rename from 100ft_v1/spiral_top.scad rename to scad/100ft_v1/spiral_top.scad diff --git a/100ft_v1/top.scad b/scad/100ft_v1/top.scad similarity index 100% rename from 100ft_v1/top.scad rename to scad/100ft_v1/top.scad diff --git a/100ft_v2/gnal_100ft.scad b/scad/100ft_v2/gnal_100ft.scad similarity index 100% rename from 100ft_v2/gnal_100ft.scad rename to scad/100ft_v2/gnal_100ft.scad diff --git a/100ft_v3/gnal_100ft.scad b/scad/100ft_v3/gnal_100ft.scad similarity index 100% rename from 100ft_v3/gnal_100ft.scad rename to scad/100ft_v3/gnal_100ft.scad diff --git a/50ft_v1/gnal_50ft.scad b/scad/50ft_v1/gnal_50ft.scad similarity index 100% rename from 50ft_v1/gnal_50ft.scad rename to scad/50ft_v1/gnal_50ft.scad diff --git a/50ft_v1/spacer.scad b/scad/50ft_v1/spacer.scad similarity index 100% rename from 50ft_v1/spacer.scad rename to scad/50ft_v1/spacer.scad diff --git a/50ft_v1/spiral_bottom.scad b/scad/50ft_v1/spiral_bottom.scad similarity index 100% rename from 50ft_v1/spiral_bottom.scad rename to scad/50ft_v1/spiral_bottom.scad diff --git a/50ft_v1/spiral_top.scad b/scad/50ft_v1/spiral_top.scad similarity index 100% rename from 50ft_v1/spiral_top.scad rename to scad/50ft_v1/spiral_top.scad diff --git a/50ft_v1/top.scad b/scad/50ft_v1/top.scad similarity index 100% rename from 50ft_v1/top.scad rename to scad/50ft_v1/top.scad diff --git a/50ft_v2/gnal_50ft.scad b/scad/50ft_v2/gnal_50ft.scad similarity index 100% rename from 50ft_v2/gnal_50ft.scad rename to scad/50ft_v2/gnal_50ft.scad diff --git a/50ft_v3/gnal_50ft.scad b/scad/50ft_v3/gnal_50ft.scad similarity index 100% rename from 50ft_v3/gnal_50ft.scad rename to scad/50ft_v3/gnal_50ft.scad diff --git a/libraries/Triangles.scad b/scad/libraries/Triangles.scad similarity index 100% rename from libraries/Triangles.scad rename to scad/libraries/Triangles.scad diff --git a/libraries/gnal_v2.scad b/scad/libraries/gnal_v2.scad similarity index 100% rename from libraries/gnal_v2.scad rename to scad/libraries/gnal_v2.scad diff --git a/libraries/gnal_v3.scad b/scad/libraries/gnal_v3.scad similarity index 100% rename from libraries/gnal_v3.scad rename to scad/libraries/gnal_v3.scad diff --git a/libraries/path_extrude.scad b/scad/libraries/path_extrude.scad similarity index 100% rename from libraries/path_extrude.scad rename to scad/libraries/path_extrude.scad diff --git a/libraries/threads.scad b/scad/libraries/threads.scad similarity index 100% rename from libraries/threads.scad rename to scad/libraries/threads.scad diff --git a/spiral/spiral_1.scad b/scad/spiral/spiral_1.scad similarity index 100% rename from spiral/spiral_1.scad rename to scad/spiral/spiral_1.scad diff --git a/spiral/spiral_2.scad b/scad/spiral/spiral_2.scad similarity index 100% rename from spiral/spiral_2.scad rename to scad/spiral/spiral_2.scad diff --git a/spiral/spiral_3.scad b/scad/spiral/spiral_3.scad similarity index 100% rename from spiral/spiral_3.scad rename to scad/spiral/spiral_3.scad diff --git a/spiral/spiral_4.scad b/scad/spiral/spiral_4.scad similarity index 100% rename from spiral/spiral_4.scad rename to scad/spiral/spiral_4.scad diff --git a/spiral/spiral_5.scad b/scad/spiral/spiral_5.scad similarity index 100% rename from spiral/spiral_5.scad rename to scad/spiral/spiral_5.scad diff --git a/spiral/spiral_6.scad b/scad/spiral/spiral_6.scad similarity index 100% rename from spiral/spiral_6.scad rename to scad/spiral/spiral_6.scad diff --git a/spiral/spiral_7.scad b/scad/spiral/spiral_7.scad similarity index 100% rename from spiral/spiral_7.scad rename to scad/spiral/spiral_7.scad diff --git a/scripts/v1.sh b/scripts/v1.sh index 2023853..bb6f2bb 100644 --- a/scripts/v1.sh +++ b/scripts/v1.sh @@ -17,15 +17,15 @@ for SIZE in "${SIZES[@]}" do : mkdir -p "${DIST}/${SIZE}_v1" - srchash=`sha256sum "${SIZE}_v1/gnal_${SIZE}.scad" | awk '{ print $1 }'` - srcsize=`wc -c < "${SIZE}_v1/gnal_${SIZE}.scad"` + srchash=`sha256sum "./scad/${SIZE}_v1/gnal_${SIZE}.scad" | awk '{ print $1 }'` + srcsize=`wc -c < "./scad/${SIZE}_v1/gnal_${SIZE}.scad"` srcsize=`echo $srcsize | xargs` for FILE in "${FILES[@]}" do : stl="${DIST}/${SIZE}_v1/gnal_${SIZE}_${FILE}.stl" - scad="${SIZE}_v1/${FILE}.scad" + scad="./scad/${SIZE}_v1/${FILE}.scad" echo "$scad" start=`date +%s` openscad -o "$stl" "$scad" diff --git a/scripts/v2.sh b/scripts/v2.sh index 0fe3ab5..7a28e4e 100644 --- a/scripts/v2.sh +++ b/scripts/v2.sh @@ -20,7 +20,7 @@ for SIZE in "${SIZES[@]}" do : mkdir -p "${DIST}/${SIZE}_${V}" - scad="${SIZE}_${V}/gnal_${SIZE}.scad" + scad="./scad/${SIZE}_${V}/gnal_${SIZE}.scad" srchash=`sha256sum "${scad}" | awk '{ print $1 }'` srcsize=`wc -c < "${scad}"` srcsize=`echo $srcsize | xargs` diff --git a/scripts/v3.sh b/scripts/v3.sh index 804bb64..753d16e 100644 --- a/scripts/v3.sh +++ b/scripts/v3.sh @@ -22,7 +22,7 @@ for SIZE in "${SIZES[@]}" do : mkdir -p "${DIST}/${SIZE}_${V}" - scad="${SIZE}_${V}/gnal_${SIZE}.scad" + scad="./scad/${SIZE}_${V}/gnal_${SIZE}.scad" srchash=`sha256sum "${scad}" | awk '{ print $1 }'` srcsize=`wc -c < "${scad}"` srcsize=`echo $srcsize | xargs`