Retain the order of the variables as they appear in the input scad file when printing the variables with -p. Properly quote OpenSCAD strings.

3 files changed, 25 insertions, 11 deletions

diff --git a/cubbies.sh b/cubbies.sh
index 925b822..d29769d 100755
--- a/cubbies.sh
+++ b/cubbies.sh
@@ -1,8 +1,9 @@
 #!/bin/bash
-# this script started off generated using shopenscad.sh -s cubbies.scad
+# this script started off generated using "shopenscad.sh -s cubbies.scad"
 
 usage() {
     cat <<EOF
+Usage:
 $0 cubby-depth cubby-height cubby-width1 [cubby-width2 ... cubby-widthN]
 
 Examples:
@@ -35,17 +36,17 @@ shopenscad_cmd="./shopenscad.sh cubbies.scad "
 
 export $(echo $($shopenscad_cmd -p))
 # # $ ./shopenscad.sh -p cubbies.scad
-# tab_padding=5
-# tab_width=10
-# max_bridge=0
-# cubby_width=150
+# part='"both"'
+# cubby_width=40
 # cubby_depth=120
-# strut_thickness=5
-# screw_tabs=true
 # cubby_height=90
-# #part="both"
-# thickness=3
+# thickness=5
+# strut_thickness=5
+# max_bridge=0
+# tab_width=10
+# tab_padding=5
 # tab_tolerance=0.5
+# screw_tabs=true
 
 cubby_depth=$1; shift
 cubby_height=$1; shift
diff --git a/dovetail_test_fits.sh b/dovetail_test_fits.sh
index 1881392..74dbcdf 100755
--- a/dovetail_test_fits.sh
+++ b/dovetail_test_fits.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 usage() {
     cat <<EOF
+Usage:
 $0
 $0 [depth] [tolerance1 tolerance2 .. toleranceN]
 
diff --git a/shopenscad.sh b/shopenscad.sh
index eba5e81..be1a9ec 100755
--- a/shopenscad.sh
+++ b/shopenscad.sh
@@ -158,6 +158,7 @@ main()
     val_sep="-"
     var_sep=","
     declare -A SCAD
+    declare -a scad_var_order
 
     while IFS= read -r line; do
         [ "$line" ] || continue;
@@ -173,6 +174,7 @@ main()
         fi
 
         if [ "$var" ] && [ "$val" ]; then
+            scad_var_order+=($var);
             SCAD[$var]="$val"
             output_params+="-D '$var=$val' "
             VALUES+="$(val_to_filename "$val")${val_sep}"
@@ -182,8 +184,17 @@ main()
                  strip_multiline_comments |strip_nonassignments |strip_trailing_semicolon)
 
     if [ "$PRINT_VARS" ]; then
-        for k in "${!SCAD[@]}"; do
-            echo ${k}=${SCAD[$k]}
+        for k in "${scad_var_order[@]}"; do
+            # if the value is an OpenSCAD string, it needs to be wrapped in
+            # quotes
+            if [ '"' == "${SCAD[$k]:0:1}" ]; then
+                line="${k}='${SCAD[$k]}'"
+            elif [ "'" == "${SCAD[$k]:0:1}" ]; then
+                line=${k}="\"${SCAD[$k]}\""
+            else
+                line="${k}=${SCAD[$k]}"
+            fi
+            echo $line
         done
         exit
     fi
@@ -228,3 +239,4 @@ EOF
 }
 
 main "$@"
+#parse_options "$@"