Allow paramters to be overridden by shell variables, i.e.: cubby_width=200 ./shopencad.sh input.scad

1 files changed, 25 insertions, 7 deletions

diff --git a/shopenscad.sh b/shopenscad.sh
index dcdb8e6..459dee1 100755
--- a/shopenscad.sh
+++ b/shopenscad.sh
@@ -35,7 +35,6 @@ function chomp () {
     strip_leading_spaces |strip_trailing_spaces
 }
 
-
 function parse_variable () {
     #sed -r 's/^([a-zA-Z0-9_]+).*/\1/'
     sed -r 's/^([^=]+)=.*/\1/'
@@ -47,7 +46,6 @@ function parse_value () {
     sed -r 's/.*=\s*([^;]+?).*/\1/'
 }
 
-
 function val_to_filename () {
     echo "$1" |sed -r 's/"//g' |sed -r 's/ /_/g'
 }
@@ -60,26 +58,46 @@ function strip_after_hidden () {
     echo "$1" |sed -n '/\/\* \[Hidden\] \*\//q;p' cubbies.scad
 }
 
+function strip_trailing () {
+    trailing="$1"
+    input="$2"
+    echo ${input%${trailing}}
+}
+
 function shopenscad () {
     input_file="$1"
     output_params=""
     output_filename=""
-    output_sh=""
+    all=""
+    vals_only=""
+    val_sep="-"
+
     while IFS= read -r line; do
         [ "$line" ] || continue;
         clean="$(echo -n "$line" |chomp)"
         var=$(echo -n "$clean" |parse_variable |chomp)
-        val=$(echo -n "$clean" |parse_value |chomp)
+
+        # use value provided on command line preferentially to any values in the .scad file
+        val=""
+        if [[ -n "${!var}" ]]; then
+            val=${!var}
+        else
+            val=$(echo -n "$clean" |parse_value |chomp)
+        fi
+
         if [ "$var" ] && [ "$val" ]; then
             output_params+="-D '$var=$val' "
-            output_sh+="${var}=${val}\n"
             output_filename+="$(val_to_filename "$val")-"
+            vals_only+="$(val_to_filename "$val")${val_sep}"
+            all+="${var}=$(val_to_filename "$val")${val_sep}"
         fi;
+
     done < <(echo "$(cat "$input_file")" |
                  strip_comments |strip_after_hidden |strip_nonassignments |strip_trailing_semicolon)
 
-    openscad_str="$openscad "$scad_file" "$output_params" -o $(strip_last_char "$output_filename").stl"
-    echo ${openscad_str}
+    openscad_str="$openscad "$scad_file" "$output_params" -o $(strip_trailing "-" "${vals_only}").stl"
+    echo "${openscad_str}"
+    
 }
 
 shopenscad "$scad_file"