Improve generated command line output

1 files changed, 5 insertions, 4 deletions

diff --git a/shopenscad.sh b/shopenscad.sh
index 65de701..c008c4e 100755
--- a/shopenscad.sh
+++ b/shopenscad.sh
@@ -4,7 +4,7 @@
 # parameterized into -D options
 
 
-openscad="openscad"
+openscad=${OPENSCAD:-"openscad"}
 
 scad_file="$1"
 
@@ -69,12 +69,13 @@ function shopenscad () {
         var=$(echo -n "$clean" |parse_variable |chomp)
         val=$(echo -n "$clean" |parse_value |chomp)
         if [ "$var" ] && [ "$val" ]; then
-            output_params+="-D $var=$val "
+            output_params+="-D '$var=$val' "
             output_filename+="$(val_to_filename "$val")-"
         fi;
-    done < <(echo "$(cat "$input_file")" |strip_comments |strip_nonassignments |strip_trailing_semicolon)
+    done < <(echo "$(cat "$input_file")" |
+                 strip_comments |strip_nonassignments |strip_trailing_semicolon)
 
-    echo "$openscad "$output_params" -o $(strip_last_char "$output_filename").stl"
+    echo "$openscad "$scad_file" "$output_params" -o $(strip_last_char "$output_filename").stl"
 }
 
 shopenscad "$scad_file"