1 files changed, 14 insertions, 2 deletions

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 "$@"